diff --git a/kate/data/CMakeLists.txt b/kate/data/CMakeLists.txt
index 10d583aae..6689852b8 100644
--- a/kate/data/CMakeLists.txt
+++ b/kate/data/CMakeLists.txt
@@ -27,7 +27,7 @@ install( FILES
     language.dtd syntax.template
     4dos.xml abap.xml abc.xml actionscript.xml ada.xml ahdl.xml ahk.xml alert_indent.xml
     alert.xml ample.xml ansic89.xml ansys.xml apache.xml asm6502.xml asm-avr.xml
-    asm-dsp56k.xml asm-m68k.xml asn1.xml asp.xml asterisk.xml awk.xml bash.xml
+    asm-dsp56k.xml asm-m68k.xml asn1.xml asp.xml asterisk.xml awk.xml bash.xml bitbake.xml
     bibtex.xml bmethod.xml carto-css.xml ccss.xml cgis.xml cg.xml changelog.xml chicken.xml
     cisco.xml clipper.xml clojure.xml cmake.xml coffee.xml coldfusion.xml
     commonlisp.xml component-pascal.xml context.xml cpp.xml crk.xml css.xml
@@ -43,13 +43,13 @@ install( FILES
     ini.xml isocpp.xml jam.xml javadoc.xml javascript.xml java.xml json.xml
     jsp.xml julia.xml j.xml kbasic.xml latex.xml ldif.xml ld.xml less.xml lex.xml lilypond.xml
     literate-curry.xml literate-haskell.xml logtalk.xml lpc.xml lsl.xml lua.xml m3u.xml
-    m4.xml mab.xml makefile.xml mako.xml mandoc.xml mason.xml mathematica.xml matlab.xml
+    m4.xml mab.xml magma.xml makefile.xml mako.xml mandoc.xml mason.xml mathematica.xml matlab.xml
     maxima.xml mediawiki.xml mel.xml mergetagtext.xml meson.xml metafont.xml mips.xml modelica.xml
     modelines.xml modula-2.xml monobasic.xml mup.xml nagios.xml nasm.xml nemerle.xml nesc.xml
     noweb.xml objectivecpp.xml objectivec.xml ocaml.xml ocamllex.xml ocamlyacc.xml
     octave.xml oors.xml opal.xml opencl.xml
     pango.xml pascal.xml perl.xml pgn.xml php.xml picsrc.xml pig.xml pike.xml
-    postscript.xml povray.xml ppd.xml progress.xml prolog.xml protobuf.xml puppet.xml
+    postscript.xml povray.xml ppd.xml praat.xml progress.xml prolog.xml protobuf.xml puppet.xml
     purebasic.xml python.xml qmake.xml qml.xml qt4.xml q.xml rapidq.xml relaxngcompact.xml
     relaxng.xml replicode.xml restructuredtext.xml rest.xml rexx.xml rhtml.xml rib.xml
     roff.xml rpmspec.xml rsiidl.xml rtf.xml ruby.xml rust.xml r.xml sather.xml scala.xml scheme.xml
diff --git a/kate/data/Makefile.am b/kate/data/Makefile.am
index 5d16efbe8..cd37bb5d2 100644
--- a/kate/data/Makefile.am
+++ b/kate/data/Makefile.am
@@ -7,7 +7,7 @@ syntaxkatedir = $(kde_datadir)/katepart/syntax
 syntaxkate_DATA = language.dtd syntax.template \
     4dos.xml abap.xml abc.xml actionscript.xml ada.xml ahdl.xml ahk.xml alert_indent.xml \
     alert.xml ample.xml ansic89.xml ansys.xml apache.xml asm6502.xml asm-avr.xml \
-    asm-dsp56k.xml asm-m68k.xml asn1.xml asp.xml asterisk.xml awk.xml bash.xml \
+    asm-dsp56k.xml asm-m68k.xml asn1.xml asp.xml asterisk.xml awk.xml bash.xml bitbake.xml \
     bibtex.xml bmethod.xml carto-css.xml ccss.xml cgis.xml cg.xml changelog.xml chicken.xml \
     cisco.xml clipper.xml clojure.xml cmake.xml coffee.xml coldfusion.xml \
     commonlisp.xml component-pascal.xml context.xml cpp.xml crk.xml css.xml \
@@ -23,13 +23,13 @@ syntaxkate_DATA = language.dtd syntax.template \
     ini.xml isocpp.xml jam.xml javadoc.xml javascript.xml javascript-php.xml java.xml json.xml \
     jsp.xml julia.xml j.xml kbasic.xml latex.xml ldif.xml ld.xml less.xml lex.xml lilypond.xml \
     literate-curry.xml literate-haskell.xml logtalk.xml lpc.xml lsl.xml lua.xml m3u.xml \
-    m4.xml mab.xml makefile.xml mako.xml mandoc.xml mason.xml mathematica.xml matlab.xml \
+    m4.xml mab.xml magma.xml makefile.xml mako.xml mandoc.xml mason.xml mathematica.xml matlab.xml \
     maxima.xml mediawiki.xml mel.xml mergetagtext.xml meson.xml metafont.xml mips.xml modelica.xml \
     modelines.xml modula-2.xml monobasic.xml mup.xml nagios.xml nasm.xml nemerle.xml nesc.xml \
     noweb.xml objectivecpp.xml objectivec.xml ocaml.xml ocamllex.xml ocamlyacc.xml \
     octave.xml oors.xml opal.xml opencl.xml \
     pango.xml pascal.xml perl.xml pgn.xml php.xml picsrc.xml pig.xml pike.xml \
-    postscript.xml povray.xml ppd.xml progress.xml prolog.xml protobuf.xml puppet.xml \
+    postscript.xml povray.xml ppd.xml praat.xml progress.xml prolog.xml protobuf.xml puppet.xml \
     purebasic.xml python.xml qmake.xml qml.xml qt4.xml q.xml rapidq.xml relaxngcompact.xml \
     relaxng.xml replicode.xml restructuredtext.xml rest.xml rexx.xml rhtml.xml rib.xml \
     roff.xml rpmspec.xml rsiidl.xml rtf.xml ruby.xml rust.xml r.xml sather.xml scala.xml scheme.xml \
diff --git a/kate/data/abap.xml b/kate/data/abap.xml
index 91ac5e5ca..c0e6ab821 100644
--- a/kate/data/abap.xml
+++ b/kate/data/abap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="ABAP" version="1.00" kateversion="2.3" section="Sources" extensions="*.abap;*.ABAP" mimetype="text/x-abap-src" priority="5" author="Marcos Antonio Alvarez Costales (busgosin@hotmail.com)" license="GPL">
+<language name="ABAP" version="2" kateversion="2.3" section="Sources" extensions="*.abap;*.ABAP" mimetype="text/x-abap-src" priority="5" author="Marcos Antonio Alvarez Costales (busgosin@hotmail.com)" license="GPL">
   <highlighting>
 
     <list name="keywords">
diff --git a/kate/data/abc.xml b/kate/data/abc.xml
index 8d5ff163b..76fccdfc0 100644
--- a/kate/data/abc.xml
+++ b/kate/data/abc.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Andrea Primiani - primiani at dag dot it
  	version1.10 - 12 december 2005 -->
-<language name="ABC" version="1.10" kateversion="2.4" section="Other" extensions="*.abc;*.ABC" mimetype="text/vnd.abc" casesensitive="1" author="Andrea Primiani (primiani@dag.it)" license="LGPL">
+<language name="ABC" version="3" kateversion="2.4" section="Other" extensions="*.abc;*.ABC" mimetype="text/vnd.abc" casesensitive="1" author="Andrea Primiani (primiani@dag.it)" license="LGPL">
     <highlighting>
         <contexts>
            <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
@@ -42,11 +42,11 @@
 	   <context name="Comment" attribute="Comment" lineEndContext="#pop" />
 <!-- returns to Normal context after the end of bar symbols or at EOL -->
 	   <context name="Bar" attribute="Bar" lineEndContext="#pop" >
-	   	<DetectChar attribute="Normal" context="#pop" char="&quot;" />
+	   	<DetectChar attribute="Normal Text" context="#pop" char="&quot;" />
 <!-- the bar symbol ends when a note letter follows -->
-		<RegExpr attribute="Normal" context="#pop" String="[A-Ga-gZz]" />
+		<RegExpr attribute="Normal Text" context="#pop" String="[A-Ga-gZz]" />
 <!-- the bar symbol ends after a white space -->
-		<DetectChar attribute="Normal" context="#pop" char=" " />
+		<DetectChar attribute="Normal Text" context="#pop" char=" " />
 <!-- detects decorations delimited by ! ! symbols -->
 	    <RangeDetect attribute="Decoration" context="#stay" char="!" char1="!" />
 <!-- detects () for slurs -->
diff --git a/kate/data/alert_indent.xml b/kate/data/alert_indent.xml
index cc108f24b..5d39117e0 100644
--- a/kate/data/alert_indent.xml
+++ b/kate/data/alert_indent.xml
@@ -26,7 +26,7 @@
  This file is included in every file that highlights the "alerts" keywords.
  That's why extensions and mimetype are empty.
 -->
-<language version="1.10-1" kateversion="2.4" name="Alerts_indent" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
+<language version="2-1" kateversion="2.4" name="Alerts_indent" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
   <highlighting>
     <contexts>
       <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
diff --git a/kate/data/asn1.xml b/kate/data/asn1.xml
index d7fb36f86..6d6d984eb 100644
--- a/kate/data/asn1.xml
+++ b/kate/data/asn1.xml
@@ -9,7 +9,7 @@
         Look at language.dtd for some documentation of the allowed elements and their attributes.
         There is also a description of how to validate your syntax file.
 -->
-<language name="ASN.1" section="Markup" version="1.01-1" kateversion="2.3" extensions="*.asn;*.asn1" mimetype="" author="Philippe Rigault" license="GPL">
+<language name="ASN.1" section="Markup" version="2-1" kateversion="2.3" extensions="*.asn;*.asn1" mimetype="" author="Philippe Rigault" license="GPL">
   <highlighting>
     <list name="keywords">
       <item> DEFINITIONS </item>
diff --git a/kate/data/asterisk.xml b/kate/data/asterisk.xml
index 4302e8ee0..708f814af 100644
--- a/kate/data/asterisk.xml
+++ b/kate/data/asterisk.xml
@@ -16,7 +16,7 @@ Version:  1.0
 
 -->
 
-<language name="Asterisk" version="1.00" kateversion="2.3" section="Configuration" extensions="*asterisk/*.conf" mimetype="" author="UNGAR Didier" license="GPL">
+<language name="Asterisk" version="2" kateversion="2.3" section="Configuration" extensions="*asterisk/*.conf" mimetype="" author="UNGAR Didier" license="GPL">
 	<highlighting>
 		<list name="keywords">
 			<item>AGI</item>
diff --git a/kate/data/bitbake.xml b/kate/data/bitbake.xml
new file mode 100644
index 000000000..d971d0bbe
--- /dev/null
+++ b/kate/data/bitbake.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+  ====================================================================
+  Bitbake syntax highlighting file for the Kate and QtCreator
+  ====================================================================
+
+  Author: Ivan Koveshnikov
+-->
+
+<language name="Bitbake" section="Sources"
+          version="2"  kateversion="2.4"
+          extensions="*.bb;*.bbappend;*.bbclass;*.inc;*.conf"
+          license="GPL" author="Ivan Koveshnikov">
+
+  <highlighting>
+
+    <list name="keywords">
+      <item> after </item>
+      <item> before </item>
+      <item> python </item>
+      <item> branch </item>
+      <item> bareclone </item>
+      <item> protocol </item>
+      <item> name </item>
+      <item> if </item>
+      <item> fi </item>
+      <item> then </item>
+      <item> rm </item>
+      <item> ln </item>
+      <item> cp </item>
+      <item> for </item>
+      <item> done </item>
+      <item> cat </item>
+    </list>
+
+    <list name="oe_functions">
+      <item> do_build </item>
+      <item> do_compile </item>
+      <item> do_compile_append </item>
+      <item> do_compile_prepend </item>
+      <item> do_compile_ptest_base </item>
+      <item> do_configure </item>
+      <item> do_configure_append </item>
+      <item> do_configure_prepend </item>
+      <item> do_configure_ptest_base </item>
+      <item> do_deploy </item>
+      <item> do_fetch </item>
+      <item> do_install </item>
+      <item> do_install_append </item>
+      <item> do_install_prepend </item>
+      <item> do_install_ptest_base </item>
+      <item> do_package </item>
+      <item> do_package_qa </item>
+      <item> do_package_write_deb </item>
+      <item> do_package_write_ipk </item>
+      <item> do_package_write_rpm </item>
+      <item> do_package_write_tar </item>
+      <item> do_packagedata </item>
+      <item> do_patch </item>
+      <item> do_populate_lic </item>
+      <item> do_populate_sdk </item>
+      <item> do_populate_sysroot </item>
+      <item> do_rm_work </item>
+      <item> do_rm_work_all </item>
+      <item> do_unpack </item>
+      <item> do_checkuri </item>
+      <item> do_checkuriall </item>
+      <item> do_clean </item>
+      <item> do_cleanall </item>
+      <item> do_cleansstate </item>
+      <item> do_devshell </item>
+      <item> do_fetchall </item>
+      <item> do_listtasks </item>
+      <item> do_package_index </item>
+      <item> do_bootimg </item>
+      <item> do_bundle_initramfs </item>
+      <item> do_rootfs </item>
+      <item> do_testimage </item>
+      <item> do_testimage_auto </item>
+      <item> do_vmdkimg </item>
+      <item> do_compile_kernelmodules </item>
+      <item> do_diffconfig </item>
+      <item> do_kernel_checkout </item>
+      <item> do_kernel_configcheck </item>
+      <item> do_kernel_configme </item>
+      <item> do_kernel_link_vmlinux </item>
+      <item> do_menuconfig </item>
+      <item> do_savedefconfig </item>
+      <item> do_sizecheck </item>
+      <item> do_strip </item>
+      <item> do_uboot_mkimage </item>
+      <item> do_validate_branches </item>
+      <item> do_generate_qt_config_file </item>
+      <item> do_spdx </item>
+      <item> oe_runmake </item>
+      <item> export </item>
+      <item> install </item>
+      <item> kernel_configme </item>
+      <item> validate_branches </item>
+
+    </list>
+
+    <list name="dependencies">
+      <item> inherit </item>
+      <item> include </item>
+      <item> require </item>
+      <item> addtask </item>
+      <item> deltask </item>
+      <item> addhandler </item>
+      <item> EXPORT_FUNCTIONS </item>
+    </list>
+
+    <contexts>
+
+      <context name="Normal Text" attribute="Normal Text" lineEndContext="#pop" >
+        <DetectSpaces/>
+        <DetectChar                         context="bbComment" char="#" />
+        <keyword attribute="Keyword"        context="#stay"     String="keywords" />
+        <keyword attribute="OEFunction"     context="#stay"     String="oe_functions" />
+        <keyword attribute="Dependency"     context="#stay"     String="dependencies" />
+        <DetectChar attribute="String"      context="bbString"  char="&quot;" />
+        <RegExpr attribute="Variable" context="#stay" String="\$\{[A-Za-z0-9_-]+\}" />
+        <RegExpr attribute="Keyword" context="#stay" String="([A-Z]+)[0-9_]*" />
+      </context>
+
+      <context name="bbString" attribute="String" lineEndContext="bbError" >
+        <keyword    attribute="Keyword"     context="#stay" String="keywords" />
+        <DetectChar attribute="String"      context="#pop"  char="&quot;" />
+        <LineContinue  attribute="Escape"   context="#stay"  />
+        <AnyChar    attribute="Normal Text" context="#stay" String="=|;," />
+        <RegExpr    attribute="BBFunction"  context="#stay" String="\$\{@[a-zA-z0-9._\-\(\), &quot;/]+\}" />
+        <RegExpr    attribute="Variable"    context="#stay" String="\$\{[A-Za-z0-9_-]+\}" />
+      </context>
+
+      <context name="bbComment" attribute="Comment" lineEndContext="#pop" />
+
+      <context name="bbError" attribute="Error" lineEndContext="#stay" >
+        <DetectChar attribute="Error"      context="#pop"  char="&quot;" />
+      </context>
+
+    </contexts>
+
+    <itemDatas>
+    <!--
+        dsNormal, used for normal text.
+        dsKeyword, used for keywords.
+        dsDataType, used for data types.
+        dsDecVal, used for decimal values.
+        dsBaseN, used for values with a base other than 10.
+        dsFloat, used for float values.
+        dsChar, used for a character.
+        dsString, used for strings.
+        dsComment, used for comments.
+        dsOthers, used for ‘other’ things.
+        dsAlert, used for warning messages.
+        dsFunction, used for function calls.
+        dsRegionMarker, used for region markers.
+        dsError, used for error highlighting and wrong syntax.
+    -->
+      <itemData name="Normal Text"    defStyleNum="dsNormal"      spellChecking="false" />
+      <itemData name="String"         defStyleNum="dsString"      spellChecking="true" />
+      <itemData name="Keyword"        defStyleNum="dsKeyword"     spellChecking="false" />
+      <itemData name="Condition"      defStyleNum="dsDataType"    spellChecking="false" />
+      <itemData name="Function"       defStyleNum="dsFunction"    spellChecking="false" />
+      <itemData name="Variable"       defStyleNum="dsOthers"      spellChecking="false" color="darkred" />
+      <itemData name="Comment"        defStyleNum="dsComment"     spellChecking="true" />
+      <itemData name="Dependency"     defStyleNum="dsDataType"    spellChecking="false"/>
+      <itemData name="BBFunction"     defStyleNum="dsOthers"      spellChecking="false" color="darkblue" />
+      <itemData name="OEFunction"     defStyleNum="dsBaseN"       spellChecking="false" />
+      <itemData name="Escape"         defStyleNum="dsOthers"      spellChecking="false" color="grey" />
+      <itemData name="Error"          defStyleNum="dsError"       spellChecking="false" />
+
+    </itemDatas>
+
+  </highlighting>
+
+  <general>
+    <comments>
+      <comment name="singleLine" start="#"/>
+    </comments>
+  </general>
+
+</language>
+
diff --git a/kate/data/changelog.xml b/kate/data/changelog.xml
index aec339214..77c17ed55 100644
--- a/kate/data/changelog.xml
+++ b/kate/data/changelog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="ChangeLog" version="1.04" kateversion="2.4" section="Other" extensions="ChangeLog" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
+<language name="ChangeLog" version="2" kateversion="2.4" section="Other" extensions="ChangeLog" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
   <highlighting>
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
diff --git a/kate/data/coldfusion.xml b/kate/data/coldfusion.xml
index 76b7f9150..7253ec63f 100644
--- a/kate/data/coldfusion.xml
+++ b/kate/data/coldfusion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="ColdFusion" version="1.05" kateversion="2.2" section="Markup" extensions="*.cfm;*.cfc;*.cfml;*.dbm" mimetype="text/x-coldfusion">
+<language name="ColdFusion" version="2" kateversion="2.2" section="Markup" extensions="*.cfm;*.cfc;*.cfml;*.dbm" mimetype="text/x-coldfusion">
 
 	<highlighting>
 
diff --git a/kate/data/component-pascal.xml b/kate/data/component-pascal.xml
index b1197b508..1aadebe56 100644
--- a/kate/data/component-pascal.xml
+++ b/kate/data/component-pascal.xml
@@ -10,7 +10,7 @@
 <!-- 19.04.2003 wb Some more Enhancements -->
 <!-- 18.04.2003 wb Enhancenment for Maior / Minor Comments and Full / ReadOnly Exports, Folds for Procedures, Records, Comments -->
 <!-- 17.04.2003 wb Enhancements for Relation and Operators -->
-<language name="Component-Pascal" version="1.05" kateversion="2.3" section="Sources" extensions="*.cp;*.bro" mimetype="text/x-component-pascal" author="Werner Braun (wb@o3-software.de)" license="">
+<language name="Component-Pascal" version="2" kateversion="2.3" section="Sources" extensions="*.cp;*.bro" mimetype="text/x-component-pascal" author="Werner Braun (wb@o3-software.de)" license="">
 	<highlighting>
 		<list name="keywords">
 			<item> BEGIN </item>
diff --git a/kate/data/debianchangelog.xml b/kate/data/debianchangelog.xml
index 4185340e3..85c1e9131 100644
--- a/kate/data/debianchangelog.xml
+++ b/kate/data/debianchangelog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Debian Changelog" version="0.71" kateversion="2.4" section="Other" extensions="" mimetype="">
+<language name="Debian Changelog" version="1" kateversion="2.4" section="Other" extensions="" mimetype="">
     <highlighting>
         <list name="keywords">
             <item>urgency</item>
@@ -48,6 +48,9 @@
             <item>buster</item>
             <item>buster-backports</item>
             <item>buster-backports-sloppy</item>
+            <item>bullseye</item>
+            <item>bullseye-backports</item>
+            <item>bullseye-backports-sloppy</item>
             <!-- Ubuntu releases -->
             <item>dapper</item>
             <item>dapper-security</item>
@@ -156,6 +159,16 @@
             <item>wily-proposed</item>
             <item>wily-updates</item>
             <item>wily-backports</item>
+            <item>xenial</item>
+            <item>xenial-security</item>
+            <item>xenial-proposed</item>
+            <item>xenial-updates</item>
+            <item>xenial-backports</item>
+            <item>yakkety</item>
+            <item>yakkety-security</item>
+            <item>yakkety-proposed</item>
+            <item>yakkety-updates</item>
+            <item>yakkety-backports</item>
         </list>
 
         <list name="urgencies">
diff --git a/kate/data/desktop.xml b/kate/data/desktop.xml
index e9c8df0bc..5ae5f6125 100644
--- a/kate/data/desktop.xml
+++ b/kate/data/desktop.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name=".desktop" version="1.06-1" kateversion="2.4"
+<language name=".desktop" version="2-1" kateversion="2.4"
           section="Configuration" extensions="*.desktop;*.kdelnk;*.desktop.cmake;*.protocol"
           mimetype="application/x-desktop">
   <highlighting>
diff --git a/kate/data/djangotemplate.xml b/kate/data/djangotemplate.xml
index b790f8355..6b1fa4fbd 100644
--- a/kate/data/djangotemplate.xml
+++ b/kate/data/djangotemplate.xml
@@ -4,7 +4,7 @@
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="Django HTML Template" version="1.3" kateversion="2.4" section="Markup" extensions="*.htm;*.html" mimetype="text/html"  author="Matthew Marshall (matthew@matthewmarshall.org)" license="LGPL" priority="9">
+<language name="Django HTML Template" version="3" kateversion="2.4" section="Markup" extensions="*.htm;*.html" mimetype="text/html"  author="Matthew Marshall (matthew@matthewmarshall.org)" license="LGPL" priority="9">
 
 <!--
     Based off of the katepart html syntax highlighting by Wilbert Berendsen.
@@ -308,7 +308,7 @@
   <itemData name="Doctype" defStyleNum="dsDataType" bold="1" />
   <itemData name="Element" defStyleNum="dsKeyword" />
   <itemData name="Attribute" defStyleNum="dsOthers" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" />
+  <itemData name="Value" defStyleNum="dsString" />
   <itemData name="EntityRef" defStyleNum="dsDecVal" />
   <itemData name="PEntityRef" defStyleNum="dsDecVal" />
   <itemData name="Error" defStyleNum="dsError" />
diff --git a/kate/data/email.xml b/kate/data/email.xml
index ca5513e2c..05c784f4e 100644
--- a/kate/data/email.xml
+++ b/kate/data/email.xml
@@ -3,7 +3,7 @@
 <!--
   Copyright (C) 2005 Carl A Joslin <carl.joslin@joslin.dyndns.org>
 -->
-<language name="Email" version="1.01" kateversion="2.3" extensions="*.eml" section="Other" mimetype="message/rfc822" casesensitive="0" author="Carl A Joslin (carl.joslin@joslin.dyndns.org)" license="GPL">
+<language name="Email" version="2" kateversion="2.3" extensions="*.eml" section="Other" mimetype="message/rfc822" casesensitive="0" author="Carl A Joslin (carl.joslin@joslin.dyndns.org)" license="GPL">
   <highlighting>
     <contexts>      
       <context name="headder" attribute="Normal Text" lineEndContext="#stay">
diff --git a/kate/data/euphoria.xml b/kate/data/euphoria.xml
index fb93a5a5f..d6ef787ac 100644
--- a/kate/data/euphoria.xml
+++ b/kate/data/euphoria.xml
@@ -29,7 +29,7 @@
 
 <!-- Store this in ~/.trinity/share/apps/katepart/syntax, -->
 
-<language name="Euphoria" version="2.09-1" kateversion="2.4" section="Scripts" extensions="*.e;*.ex;*.exw;*.exu" mimetype="text/x-euphoria" author="Irv Mullins (irvm@ellijay.com)" license="LGPL">
+<language name="Euphoria" version="3-1" kateversion="2.4" section="Scripts" extensions="*.e;*.ex;*.exw;*.exu" mimetype="text/x-euphoria" author="Irv Mullins (irvm@ellijay.com)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> abort </item>
diff --git a/kate/data/gdl.xml b/kate/data/gdl.xml
index 84f4f9897..32f73b5e5 100644
--- a/kate/data/gdl.xml
+++ b/kate/data/gdl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="GDL" version="1.01" kateversion="2.2" section="Scientific" extensions="*.gdl;*.vcg;*.GDL;*.VCG" mimetype="">
+<language name="GDL" version="2" kateversion="2.2" section="Scientific" extensions="*.gdl;*.vcg;*.GDL;*.VCG" mimetype="">
  <highlighting>
   <list name="colors">
    <item> white </item>
diff --git a/kate/data/git-ignore.xml b/kate/data/git-ignore.xml
index ab4a7841b..8183a78c7 100644
--- a/kate/data/git-ignore.xml
+++ b/kate/data/git-ignore.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Git Ignore" version="0.1" kateversion="2.4" section="Configuration"  extensions=".gitignore*;" mimetype="text/x-git-ignore" license="LGPL">
+<language name="Git Ignore" version="1" kateversion="2.4" section="Configuration"  extensions=".gitignore*;" mimetype="text/x-git-ignore" license="LGPL">
     <highlighting>
         <contexts>
            
diff --git a/kate/data/git-rebase.xml b/kate/data/git-rebase.xml
index 69f4b535c..49c2dae7b 100644
--- a/kate/data/git-rebase.xml
+++ b/kate/data/git-rebase.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Git Rebase" version="1.00" kateversion="2.4" section="Other" extensions="git-rebase-todo" license="LGPL" mimetype="text/vnd.git.rebase" author="Orgad Shaneh (orgads@gmail.com)">
+<language name="Git Rebase" version="2" kateversion="2.4" section="Other" extensions="git-rebase-todo" license="LGPL" mimetype="text/vnd.git.rebase" author="Orgad Shaneh (orgads@gmail.com)">
   <highlighting>
     <list name="pick">
       <item>p</item>
diff --git a/kate/data/hamlet.xml b/kate/data/hamlet.xml
index 1dedd09cf..f413739d1 100644
--- a/kate/data/hamlet.xml
+++ b/kate/data/hamlet.xml
@@ -5,7 +5,7 @@
   word character *or* a number, hence the lookahead -->
   <!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
 ]>
-<language name="Hamlet" version="0.1" kateversion="2.4" section="Markup" extensions="*.hamlet" author="Bastian Holst (bastianholst@gmx.de)" license="LGPL" indenter="haskell">
+<language name="Hamlet" version="2" kateversion="2.4" section="Markup" extensions="*.hamlet" author="Bastian Holst (bastianholst@gmx.de)" license="LGPL" indenter="haskell">
 <highlighting>
 <contexts>
   <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
@@ -87,8 +87,8 @@
   <itemData name="Normal Text" defStyleNum="dsNormal" />
   <itemData name="Element" defStyleNum="dsKeyword" />
   <itemData name="Attribute" defStyleNum="dsOthers" spellChecking="false" />
-  <itemData name="Class" defStyleNum="dsString" color="#a00" spellChecking="false" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" spellChecking="false" />
+  <itemData name="Class" defStyleNum="dsString" spellChecking="false" />
+  <itemData name="Value" defStyleNum="dsString" spellChecking="false" />
   <itemData name="Logic" defStyleNum="dsKeyword" spellChecking="false" />
   <itemData name="Code"  defStyleNum="dsKeyword" spellChecking="false" />
   <itemData name="Error" defStyleNum="dsError" spellChecking="false" />
diff --git a/kate/data/haxe.xml b/kate/data/haxe.xml
index 72f179578..e51b9f457 100644
--- a/kate/data/haxe.xml
+++ b/kate/data/haxe.xml
@@ -12,7 +12,7 @@
   ========================================================================
 -->
 
-<language name="Haxe" section="Sources" extensions="*.hx;*.Hx;*.hX;*.HX;" mimetype="text/x-hxsrc" version="0.1" kateversion="2.4" casesensitive="true" author="Chad Joan" license="MIT">
+<language name="Haxe" section="Sources" extensions="*.hx;*.Hx;*.hX;*.HX;" mimetype="text/x-hxsrc" version="1" kateversion="2.4" casesensitive="true" author="Chad Joan" license="MIT">
   <highlighting>
     <list name="keywords">
     
diff --git a/kate/data/idconsole.xml b/kate/data/idconsole.xml
index 8732e778c..4e4f1faf6 100644
--- a/kate/data/idconsole.xml
+++ b/kate/data/idconsole.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Quake Script" version="1.02" kateversion="2.2" section="Scripts" extensions="*.cfg" mimetype="">
+<language name="Quake Script" version="2" kateversion="2.2" section="Scripts" extensions="*.cfg" mimetype="">
 
 <highlighting>
 <list name="Commands">
diff --git a/kate/data/idl.xml b/kate/data/idl.xml
index 2aad8638a..0e9fa811f 100644
--- a/kate/data/idl.xml
+++ b/kate/data/idl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="IDL" version="1.07" kateversion="2.4" section="Sources" extensions="*.idl" mimetype="text/x-idl-src">
+<language name="IDL" version="2" kateversion="2.4" section="Sources" extensions="*.idl" mimetype="text/x-idl-src">
   <highlighting>
     <list name="keywords">
       <item> any </item>
diff --git a/kate/data/ilerpg.xml b/kate/data/ilerpg.xml
index ac12be0d9..a6245bf21 100644
--- a/kate/data/ilerpg.xml
+++ b/kate/data/ilerpg.xml
@@ -45,7 +45,7 @@
 
 -->
 
-<language name="ILERPG" version="1.05-1" kateversion="2.2" section="Sources" extensions="QRPG*.*;qrpg*.*" mimetype="text/x-ilerpg-src" casesensitive="0">
+<language name="ILERPG" version="2-1" kateversion="2.2" section="Sources" extensions="QRPG*.*;qrpg*.*" mimetype="text/x-ilerpg-src" casesensitive="0">
     <highlighting>
     <list name="dkeywords">
 	    <item> EXTPROC </item>
diff --git a/kate/data/inform.xml b/kate/data/inform.xml
index 933bac058..ce0028241 100644
--- a/kate/data/inform.xml
+++ b/kate/data/inform.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- author: Giancarlo Niccolai (giancarlo@niccolai.ws) -->
 <!-- This file is released under GPL license 2.0 or any later version at your choice. -->
-<language name="Inform" version="1.23-1" kateversion="2.4" section="Sources" extensions="*.inf;*.h" mimetype="text/x-inform-src" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
+<language name="Inform" version="2" kateversion="2.4" section="Sources" extensions="*.inf;*.h" mimetype="text/x-inform-src" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
 <highlighting>
    <list name="keywords">
       <item> if </item>
@@ -73,7 +73,7 @@
       <item> TryNumber </item>
       <item> UnsignedCompare </item>
       <item> WordAddress </item>
-      <item> WordLength </item>
+      <item> WordLenght </item>
       <item> WriteListFrom </item>
       <item> YesOrNo </item>
       <item> ZRegion </item>
diff --git a/kate/data/ini.xml b/kate/data/ini.xml
index 281938b59..4c08d8704 100644
--- a/kate/data/ini.xml
+++ b/kate/data/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;*.service;*.target" mimetype="" version="1.1-1" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc;*.service;*.target" mimetype="" version="2-1" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
 
 <highlighting>
 <list name="keywords">
@@ -34,7 +34,7 @@
 
 <contexts>
  <context name="ini" attribute="Normal Text" lineEndContext="#stay">
-  <RangeDetect attribute="Section" context="#pop" char="["  char1="]" beginRegion="Section" endRegion="Section" />
+  <RangeDetect attribute="Section" context="#stay" char="["  char1="]" beginRegion="Section" endRegion="Section" />
   <DetectChar attribute="Assignment" context="Value" char="=" />
   <DetectChar char=";" attribute="Comment" context="Comment" firstNonSpace="true" />
   <DetectChar char="#" attribute="Comment" context="Comment" firstNonSpace="true" />
diff --git a/kate/data/jam.xml b/kate/data/jam.xml
index 4fe64644b..6d71eed48 100644
--- a/kate/data/jam.xml
+++ b/kate/data/jam.xml
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 -->
-<language name="Jam" version="0.4" kateversion="2.4" section="Other" extensions="Jam*;*.jam" mimetype="text/x-jam;text/x-Jamfile;text/x-Jamrules;text/x-Jambase">
+<language name="Jam" version="1" kateversion="2.4" section="Other" extensions="Jam*;*.jam" mimetype="text/x-jam;text/x-Jamfile;text/x-Jamrules;text/x-Jambase">
   <!--
   Changelog
     0.2
diff --git a/kate/data/javadoc.xml b/kate/data/javadoc.xml
index 25eab95e1..c16cba342 100644
--- a/kate/data/javadoc.xml
+++ b/kate/data/javadoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Javadoc" version="1.05" kateversion="2.4" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Javadoc" version="2" kateversion="2.4" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<contexts>
 			<context name="Start" attribute="Normal Text" lineEndContext="#stay">
diff --git a/kate/data/json.xml b/kate/data/json.xml
index d35246ac2..a187fe8f3 100644
--- a/kate/data/json.xml
+++ b/kate/data/json.xml
@@ -12,7 +12,7 @@
  ** http://tools.ietf.org/html/rfc4627
  ***************************************************************************
 -->
-<language name="JSON" section="Markup" version="1.3" kateversion="2.4" extensions="*.json" mimetype="application/json" author="Sebastian Pipping (sebastian@pipping.org)" license="GPL">
+<language name="JSON" section="Markup" version="2" kateversion="2.4" extensions="*.json;.kateproject;.arcconfig" mimetype="application/json" author="Sebastian Pipping (sebastian@pipping.org)" license="GPL">
   <highlighting>
     <list name="Constants">
       <item>null</item>
diff --git a/kate/data/jsp.xml b/kate/data/jsp.xml
index da448227e..26b9b46e6 100644
--- a/kate/data/jsp.xml
+++ b/kate/data/jsp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language version="1.02" kateversion="2.4" name="JSP" section="Markup" extensions="*.jsp;*.JSP" mimetype="text/html" casesensitive="false" author="Rob Martin (rob@gamepimp.com)" license="LGPL">
+<language version="2" kateversion="2.4" name="JSP" section="Markup" extensions="*.jsp;*.JSP" mimetype="text/html" casesensitive="false" author="Rob Martin (rob@gamepimp.com)" license="LGPL">
   <highlighting>
 
     <list name="java-1.4.2-classes">
diff --git a/kate/data/julia.xml b/kate/data/julia.xml
index cad27e9d7..9fe825fef 100644
--- a/kate/data/julia.xml
+++ b/kate/data/julia.xml
@@ -29,7 +29,7 @@
 
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="Julia" section="Sources" version="0.2-1" kateversion="2.4" extensions="*.jl" casesensitive="1" priority="5" license="MIT">
+<language name="Julia" section="Sources" version="1-1" kateversion="2.4" extensions="*.jl" casesensitive="1" priority="5" license="MIT">
 
   <highlighting>
     <list name="block_begin">
diff --git a/kate/data/kbasic.xml b/kate/data/kbasic.xml
index 4cf893a7b..c3ca28178 100644
--- a/kate/data/kbasic.xml
+++ b/kate/data/kbasic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="KBasic" version="1.02" kateversion="2.2" section="Sources" extensions="*.kbasic" mimetype="text/x-kbasic-src">
+<language name="KBasic" version="2" kateversion="2.2" section="Sources" extensions="*.kbasic" mimetype="text/x-kbasic-src">
     <highlighting>
         <list name="keywords">
         <item> For </item>
diff --git a/kate/data/ld.xml b/kate/data/ld.xml
index a4e8fb041..29501d678 100644
--- a/kate/data/ld.xml
+++ b/kate/data/ld.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- GNU LD Linker Script syntax highlighter -->
-<language name="GNU Linker Script" section="Scripts" extensions="*.ld" version="1.0" kateversion="2.4" author="Lyle Putnam (lcputnam@gmail.com)" license="">
+<language name="GNU Linker Script" section="Scripts" extensions="*.ld" version="2" kateversion="2.4" author="Lyle Putnam (lcputnam@gmail.com)" license="">
     <highlighting>
         <list name="keywords">
             <item> AT </item>
diff --git a/kate/data/ldif.xml b/kate/data/ldif.xml
index d0da293a1..fde17f059 100644
--- a/kate/data/ldif.xml
+++ b/kate/data/ldif.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="LDIF" version="1.02" kateversion="2.4" section="Database" extensions="*.ldif" mimetype="application/directory" author="Andreas Hochsteger (e9625392@student.tuwien.ac.at)" license="">
+<language name="LDIF" version="2" kateversion="2.4" section="Database" extensions="*.ldif" mimetype="application/directory" author="Andreas Hochsteger (e9625392@student.tuwien.ac.at)" license="">
 	<highlighting>
 		<list name="attributetypes">
 			<item>IPPhone</item>
diff --git a/kate/data/lex.xml b/kate/data/lex.xml
index ae1e6f4eb..78d9801f7 100644
--- a/kate/data/lex.xml
+++ b/kate/data/lex.xml
@@ -18,7 +18,7 @@
   
   ========================================================================
 -->
-<language name="Lex/Flex" version="1.01-1" kateversion="2.4" section="Sources" extensions="*.l;*.lex;*.flex" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
+<language name="Lex/Flex" version="2-1" kateversion="2.4" section="Sources" extensions="*.l;*.lex;*.flex" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
 
 <highlighting>
 <contexts>
diff --git a/kate/data/logtalk.xml b/kate/data/logtalk.xml
index 17e130c8f..d2de708dc 100644
--- a/kate/data/logtalk.xml
+++ b/kate/data/logtalk.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="Logtalk" version="1.51" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0">
+<language name="Logtalk" version="2" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0">
 
 	<highlighting>
 
diff --git a/kate/data/lpc.xml b/kate/data/lpc.xml
index 2b13ef7ff..a30d220d7 100644
--- a/kate/data/lpc.xml
+++ b/kate/data/lpc.xml
@@ -16,7 +16,7 @@ License:     Artistic
 -->
 
 
-<language name="LPC" version="0.76" kateversion="2.4" section="Sources" extensions="*.c;*.h;*.inc;*.o" author="Andreas Klauer (Andreas.Klauer@metamorpher.de)" license="Artistic" >
+<language name="LPC" version="1" kateversion="2.4" section="Sources" extensions="*.c;*.h;*.inc;*.o" author="Andreas Klauer (Andreas.Klauer@metamorpher.de)" license="Artistic" >
 
   <highlighting>
 
diff --git a/kate/data/lsl.xml b/kate/data/lsl.xml
index 391129218..cee70eaab 100644
--- a/kate/data/lsl.xml
+++ b/kate/data/lsl.xml
@@ -11,7 +11,7 @@
   <!ENTITY FS "(f|F)">
 ]>
 <!-- versioning is based on the slviewer source code version from which strings were extracted, then a point version for this file -->
-<language name="LSL" section="Scripts" version="1.20" kateversion="2.5" extensions="*.lsl" mimetype="text/x-lsl" author="Rafał Rzepecki" license="LGPL-3">
+<language name="LSL" section="Scripts" version="2" kateversion="2.5" extensions="*.lsl" mimetype="text/x-lsl" author="Rafał Rzepecki" license="LGPL-3">
   <highlighting>
     <!-- types, keyword, events, constants and symbols are from indra.l -->
     <list name="types">
diff --git a/kate/data/m3u.xml b/kate/data/m3u.xml
index b3ee4cae3..99171b0c8 100644
--- a/kate/data/m3u.xml
+++ b/kate/data/m3u.xml
@@ -14,7 +14,7 @@ v1.0:
 -first Release
 -->
 
-<language name="M3U" section="Other" extensions="*.m3u" mimetype="audio/x-mpegurl" version="1.10-1" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL" >
+<language name="M3U" section="Other" extensions="*.m3u" mimetype="audio/x-mpegurl" version="2" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL" >
 
 <highlighting>
 <contexts>
@@ -25,7 +25,7 @@ v1.0:
  </context>
 
  <context name="FindEXTINF" attribute="Normal Text" lineEndContext="#stay">
-  <RegExpr attribute="Length" String=":\d+" />
+  <RegExpr attribute="Lenght" String=":\d+" />
   <RegExpr attribute="Descr" context="#pop" String=",.*$" />
  </context>
 </contexts>
@@ -36,7 +36,7 @@ v1.0:
  <itemData name="Comment" defStyleNum="dsComment" />
 
  <itemData name="EXTINF" defStyleNum="dsOthers" />
- <itemData name="Length" defStyleNum="dsDecVal" />
+ <itemData name="Lenght" defStyleNum="dsDecVal" />
  <itemData name="Descr" defStyleNum="dsString" />
 </itemDatas>
 </highlighting>
diff --git a/kate/data/mab.xml b/kate/data/mab.xml
index 338d24070..387432dfa 100644
--- a/kate/data/mab.xml
+++ b/kate/data/mab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="MAB-DB" version="1.03" kateversion="2.4" extensions="*.mab;*.MAB;*.Mab" section="Markup" mimetype="text/x-mab" casesensitive="0">
+<language name="MAB-DB" version="2" kateversion="2.4" extensions="*.mab;*.MAB;*.Mab" section="Markup" mimetype="text/x-mab" casesensitive="0">
   <highlighting>
     <contexts>
       <context attribute="Normal Text" name="Section" lineEndContext="#stay" >
diff --git a/kate/data/magma.xml b/kate/data/magma.xml
new file mode 100644
index 000000000..80a7521da
--- /dev/null
+++ b/kate/data/magma.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="Magma" section="Scientific"
+          version="2" kateversion="2.4"
+          mimetype="text/x-magma"
+          indenter="cstyle"
+          extensions="*.m;*.mag">
+	<highlighting>
+		<list name="keywords">
+			<item> and </item>
+			<item> assert </item>
+			<item> assigned </item>
+			<item> attributes </item>
+			<item> break </item>
+			<item> by </item>
+			<item> case </item>
+			<item> cat </item>
+			<item> cmpeq </item>
+			<item> cmpne </item>
+			<item> continue </item>
+			<item> declare </item>
+			<item> delete </item>
+			<item> diff </item>
+			<item> div </item>
+			<item> do </item>
+			<item> else </item>
+			<item> elif </item>
+			<item> end </item>
+			<item> eq </item>
+			<item> error </item>
+			<item> exists </item>
+			<item> false </item>
+			<item> for </item>
+			<item> forall </item>
+			<item> forward </item>
+			<item> freeze </item>
+			<item> function </item>
+			<item> ge </item>
+			<item> gt </item>
+			<item> if </item>
+			<item> import </item>
+			<item> in </item>
+			<item> intrinsic </item>
+			<item> join </item>
+			<item> le </item>
+			<item> lt </item>
+			<item> max </item>
+			<item> meet </item>
+			<item> min </item>
+			<item> mod </item>
+			<item> ne </item>
+			<item> not </item>
+			<item> or </item>
+			<item> procedure </item>
+			<item> quit </item>
+			<item> repeat </item>
+			<item> require </item>
+			<item> requirege </item>
+			<item> requirerange </item>
+			<item> return </item>
+			<item> sdiff </item>
+			<item> select </item>
+			<item> then </item>
+			<item> time </item>
+			<item> to </item>
+			<item> true </item>
+			<item> until </item>
+			<item> verbose </item>
+			<item> vprint </item>
+			<item> vtime </item>
+			<item> when </item>
+			<item> while </item>
+			<item> xor </item>
+		</list>
+		<list name="types">
+			<item> Booleans </item>
+			<item> EllipticCurve </item>
+			<item> ExtensionField </item>
+			<item> FiniteField </item>
+			<item> GF </item>
+			<item> HyperellipticCurve </item>
+			<item> Integers </item>
+			<item> Jacobian </item>
+			<item> PolynomialRing </item>
+			<item> Rationals </item>
+			<item> RealField </item>
+		</list>
+		<list name="directives">
+			<item> AddAttribute </item>
+			<item> AssignNames </item>
+			<item> Attach </item>
+			<item> AttachSpec </item>
+			<item> CoveringStructure </item>
+			<item> Cputime </item>
+			<item> Detach </item>
+			<item> DetachSpec </item>
+			<item> ElementType </item>
+			<item> ExistsCoveringStructure </item>
+			<item> ExtendedType </item>
+			<item> GetAttributes </item>
+			<item> GetSeed </item>
+			<item> ISA </item>
+			<item> IsCoercible </item>
+			<item> IsIntrinsic </item>
+			<item> ListAttributes </item>
+			<item> MakeType </item>
+			<item> Random </item>
+			<item> Realtime </item>
+			<item> SetSeed </item>
+			<item> Type </item>
+		</list>
+		<contexts>
+			<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+        <RegExpr attribute="Keyword" context="#stay" String="\b(function|procedure|if|elif|else|for|repeat|while|case)(?=(\{[^}]*(\}|$)|\(\*.*(\*\)|$))*([\s]|$|//))" insensitive="false" beginRegion="Region1"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(end|elif|else)(?=((\{[^}]*(\}|$)|\(\*.*(\*\)|$))*)([.;\s]|$)|//|$)" insensitive="false" endRegion="Region1"/>
+				<keyword attribute="Keyword" context="#stay" String="keywords"/>
+				<keyword attribute="Directive" context="#stay" String="directives"/>
+				<keyword attribute="Type" context="#stay" String="types"/>
+				<Float attribute="Number" context="#stay"/>
+				<Int attribute="Number" context="#stay"/>
+				<DetectChar attribute="String" context="String1" char="&quot;" />
+				<DetectChar attribute="String" context="String2" char="'" />
+				<Detect2Chars attribute="Comment" context="Comment1" char="/" char1="/"/>
+				<Detect2Chars attribute="Comment" context="Comment2" char="/" char1="*"/>
+			</context>
+			<context attribute="String" lineEndContext="#pop" name="String1">
+				<DetectChar attribute="String" context="#pop" char="&quot;"/>
+			</context>
+			<context attribute="String" lineEndContext="#pop" name="String2">
+				<DetectChar attribute="String" context="#pop" char="'" />
+			</context>
+			<context attribute="Comment" lineEndContext="#pop" name="Comment1" />
+			<context attribute="Comment" lineEndContext="#stay" name="Comment2">
+				<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/"/>
+			</context>
+		</contexts>
+		<itemDatas>
+			<itemData name="Normal Text" defStyleNum="dsNormal" />
+			<itemData name="Keyword"     defStyleNum="dsKeyword" />
+			<itemData name="Type"        defStyleNum="dsDataType"/>
+			<itemData name="Number"      defStyleNum="dsDecVal" />
+			<itemData name="String"      defStyleNum="dsString" />
+			<itemData name="Directive"   defStyleNum="dsOthers" />
+			<itemData name="Comment"     defStyleNum="dsComment" />
+		</itemDatas>
+	</highlighting>
+	<general>
+		<keywords casesensitive="1" />
+		<comments>
+			<comment name="singleLine" start="//" />
+			<comment name="multiLine" start="/*" end="*/" />
+		</comments>
+	</general>
+</language>
diff --git a/kate/data/mandoc.xml b/kate/data/mandoc.xml
index ba388d05e..4fd8b2a65 100644
--- a/kate/data/mandoc.xml
+++ b/kate/data/mandoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Troff Mandoc" section="Markup" version="0.11" kateversion="2.4" extensions="*.1;*.2;*.3;*.4;*.5;*.6;*.7;*.8;*.1m;*.3x;*.tmac" mimetype="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
+<language name="Troff Mandoc" section="Markup" version="1" kateversion="2.4" extensions="*.1;*.2;*.3;*.4;*.5;*.6;*.7;*.8;*.1m;*.3x;*.tmac" mimetype="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
 
   <highlighting>
 
diff --git a/kate/data/mason.xml b/kate/data/mason.xml
index c67b8516d..394dde780 100644
--- a/kate/data/mason.xml
+++ b/kate/data/mason.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language version="1.06" kateversion="2.4" name="Mason" section="Scripts" extensions="*.html;" mimetype="">
+<language version="2" kateversion="2.4" name="Mason" section="Scripts" extensions="*.html;" mimetype="">
 <highlighting>
 	<list name="keywords">
 		<item> sub </item>
diff --git a/kate/data/matlab.xml b/kate/data/matlab.xml
index 03bae1ca8..e2013561e 100644
--- a/kate/data/matlab.xml
+++ b/kate/data/matlab.xml
@@ -57,7 +57,7 @@
 
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="Matlab" version="1.31-1" kateversion="2.2" section="Scientific" extensions="*.m;*.M" mimetype="text/mfile" casesensitive="1">
+<language name="Matlab" version="2-1" kateversion="2.2" section="Scientific" extensions="*.m;*.M" mimetype="text/mfile" casesensitive="1">
   <highlighting>
 
     <!-- Reserved keywords in MATLAB -->
diff --git a/kate/data/mel.xml b/kate/data/mel.xml
index 448b320f9..522dabacc 100644
--- a/kate/data/mel.xml
+++ b/kate/data/mel.xml
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 -->
 
-<language name="MEL" section="Scripts" version="1.01" kateversion="2.4" extensions="*.mel" mimetype="" author="Karl Erlandsen (karlerlandsen@yahoo.com)" license="GPL">
+<language name="MEL" section="Scripts" version="2" kateversion="2.4" extensions="*.mel" mimetype="" author="Karl Erlandsen (karlerlandsen@yahoo.com)" license="GPL">
   <highlighting>
     <list name="keywords">
       <item> break </item>
diff --git a/kate/data/mergetagtext.xml b/kate/data/mergetagtext.xml
index e7da98bc4..0cd7d50da 100644
--- a/kate/data/mergetagtext.xml
+++ b/kate/data/mergetagtext.xml
@@ -25,7 +25,7 @@
  * Boston, MA  02110-1301, USA.                                       *
  **********************************************************************
  -->
-<language name="mergetag text" version="0.1" kateversion="2.4" section="Configuration" author="Diggory Hardy (diggory.hardy@gmail.com)" license="LGPL" extensions="*.mtt;">
+<language name="mergetag text" version="1" kateversion="2.4" section="Configuration" author="Diggory Hardy (diggory.hardy@gmail.com)" license="LGPL" extensions="*.mtt;">
   <highlighting>
     <contexts>
       <context name="Normal" attribute="Error" lineEndContext="#stay">
diff --git a/kate/data/meson.xml b/kate/data/meson.xml
index 023d9fee6..8be09c56c 100644
--- a/kate/data/meson.xml
+++ b/kate/data/meson.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language name="Meson" section="Other"
-	version="1.0" kateversion="2.4"
+	version="2" kateversion="2.4"
 	extensions="meson.build;meson_options.txt"
 	mimetype="text/x-meson"
 	priority="5"
diff --git a/kate/data/metafont.xml b/kate/data/metafont.xml
index 74538db73..4ce1e1412 100644
--- a/kate/data/metafont.xml
+++ b/kate/data/metafont.xml
@@ -6,7 +6,7 @@ We have moved some keywords for consistency
 -->
 
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Metapost/Metafont" section="Markup" version="0.9" kateversion="2.4"
+<language name="Metapost/Metafont" section="Markup" version="1" kateversion="2.4"
 extensions="*.mp;*.mps;*.mpost;*.mf" mimetype="text/x-metapost" 
 author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
   <highlighting>
diff --git a/kate/data/mips.xml b/kate/data/mips.xml
index c08b89df4..51b6fc9f9 100644
--- a/kate/data/mips.xml
+++ b/kate/data/mips.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="MIPS Assembler" version="1.03" kateversion="2.4" section="Assembler" extensions="*.s;" mimetype="text/x-mips" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" priority="-1">
+<language name="MIPS Assembler" version="2" kateversion="2.4" section="Assembler" extensions="*.s;" mimetype="text/x-mips" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" priority="-1">
   <highlighting>
     <list name="type">
       <item> .align </item>
diff --git a/kate/data/modelica.xml b/kate/data/modelica.xml
index 8a0c4cfdf..5c2da660c 100644
--- a/kate/data/modelica.xml
+++ b/kate/data/modelica.xml
@@ -16,7 +16,7 @@
 -->
 
 
-<language name="Modelica" version="3.2-1" kateversion="2.4" casesensitive="1" section="Sources" extensions="*.mo" author="Federico Zenith" >
+<language name="Modelica" version="4-1" kateversion="2.4" casesensitive="1" section="Sources" extensions="*.mo" author="Federico Zenith" >
 
 	<highlighting>
 		<!-- Classes in Modelica can be called different names; "class" is the
diff --git a/kate/data/modula-2.xml b/kate/data/modula-2.xml
index 234cf8545..b6c65a274 100644
--- a/kate/data/modula-2.xml
+++ b/kate/data/modula-2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Modula-2" version="1.03" kateversion="2.2" section="Sources" extensions="*.mod;*.def;*.mi;*.md" mimetype="text/x-modula-2">
+<language name="Modula-2" version="2" kateversion="2.2" section="Sources" extensions="*.mod;*.def;*.mi;*.md" mimetype="text/x-modula-2">
   <highlighting>
     <list name="directives">
       <item> ASSEMBLER </item>
diff --git a/kate/data/monobasic.xml b/kate/data/monobasic.xml
index aa0b93dd8..51f62d539 100644
--- a/kate/data/monobasic.xml
+++ b/kate/data/monobasic.xml
@@ -10,7 +10,7 @@
     License: GNU General Public License
 -->
 
-<language name="MonoBasic" section="Sources" version="1.01" kateversion="2.3" extensions="*.vb" mimetype="" author="Davide Bettio (davide.bettio@kdemail.net)" license="GPL">
+<language name="MonoBasic" section="Sources" version="2" kateversion="2.3" extensions="*.vb" mimetype="" author="Davide Bettio (davide.bettio@kdemail.net)" license="GPL">
   <highlighting>
      <list name="keywords">
         <item> Option </item>
diff --git a/kate/data/mup.xml b/kate/data/mup.xml
index 266c4e1e9..38d949b38 100644
--- a/kate/data/mup.xml
+++ b/kate/data/mup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Music Publisher" version="1.07" kateversion="2.4" section="Other" extensions="*.mup;*.not" mimetype="text/x-mup;audio/x-mup;application/x-mup;audio/x-notes" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Music Publisher" version="2" kateversion="2.4" section="Other" extensions="*.mup;*.not" mimetype="text/x-mup;audio/x-mup;application/x-mup;audio/x-notes" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
   <highlighting>
 
diff --git a/kate/data/nagios.xml b/kate/data/nagios.xml
index d4f3634a8..362103a47 100644
--- a/kate/data/nagios.xml
+++ b/kate/data/nagios.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Nagios" section="Configuration" extensions="*.cfg" version="1.0" kateversion="2.4" author="Gastón Martini" license="GPL" casesensitive="true">
+<language name="Nagios" section="Configuration" extensions="*.cfg" version="2" kateversion="2.4" author="Gastón Martini" license="GPL" casesensitive="true">
     <highlighting>
         <list name="Objects">
             <item>host</item>
diff --git a/kate/data/nasm.xml b/kate/data/nasm.xml
index 315f2d548..8c5dbf03e 100644
--- a/kate/data/nasm.xml
+++ b/kate/data/nasm.xml
@@ -40,7 +40,7 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 -->
-<language name="Intel x86 (NASM)" section="Assembler" version="1.40" kateversion="2.3" extensions="*.asm" mimetype="" author="Nicola Gigante (nicola.gigante@gmail.com)" license="GPL">
+<language name="Intel x86 (NASM)" section="Assembler" version="2" kateversion="2.3" extensions="*.asm" mimetype="" author="Nicola Gigante (nicola.gigante@gmail.com)" license="GPL">
   <highlighting>
     <list name="registers">
       <!-- General purpose registers -->
diff --git a/kate/data/nemerle.xml b/kate/data/nemerle.xml
index 4eb1a7ba5..208d70df1 100644
--- a/kate/data/nemerle.xml
+++ b/kate/data/nemerle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Nemerle syntax highlighting v0.2 by caminoix, approved of and corrected by Kamil Skalski (Nazgul) -->
-<language name="Nemerle" version="0.32" kateversion="2.3" section="Sources" extensions="*.n" mimetype="text/x-nemerle" casesensitive="1" author="caminoix + Kamil Skalski (Nazgul)" license="">
+<language name="Nemerle" version="1" kateversion="2.3" section="Sources" extensions="*.n" mimetype="text/x-nemerle" casesensitive="1" author="caminoix + Kamil Skalski (Nazgul)" license="">
 	<highlighting>
 		<list name="Attributes">
 			<item>abstract</item>
diff --git a/kate/data/nesc.xml b/kate/data/nesc.xml
index e90d4e219..5a88f87a0 100644
--- a/kate/data/nesc.xml
+++ b/kate/data/nesc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="nesC" author="Shakthi Kannan" license="GPLv2" version="1.00-1" kateversion="2.3" section="Sources" extensions="*.nc" mimetype="text/x-ncsrc" priority="5">
+<language name="nesC" author="Shakthi Kannan" license="GPLv2" version="2" kateversion="2.3" section="Sources" extensions="*.nc" mimetype="text/x-ncsrc" priority="5">
   <highlighting>
     <list name="keywords">
       <item> break </item>
@@ -41,6 +41,7 @@
       <item> call </item>
       <item> signal </item>
       <item> post </item>
+      
     </list>
     <list name="types">
       <item> auto </item>
@@ -120,7 +121,9 @@
       <context attribute="Normal Text" lineEndContext="#pop" name="Member">
         <RegExpr attribute="Function" context="#pop" String="\b[_\w][_\w\d]*(?=[\s]*)"/>
       </context>
-
+      
+            
+      
       <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
 	      <IncludeRules context="##Alerts"/>
       </context>
@@ -128,7 +131,12 @@
 	      <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
 	      <keyword attribute="Decimal" context="#stay" String="attention"/>
       </context>
-
+      
+      
+      
+      
+      
+      
       <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
         <LineContinue attribute="Preprocessor" context="#stay"/>
         <RegExpr attribute="Preprocessor" context="Define" String="define.*((?=\\))"/>
diff --git a/kate/data/noweb.xml b/kate/data/noweb.xml
index 1281c7268..09641afab 100644
--- a/kate/data/noweb.xml
+++ b/kate/data/noweb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="noweb" version="1.0" kateversion="2.4" section="Sources" extensions="*.w;*.nw" author="Scott Collins (scc@scottcollins.net)">
+<language name="noweb" version="2" kateversion="2.4" section="Sources" extensions="*.w;*.nw" author="Scott Collins (scc@scottcollins.net)">
 <!-- 
 #########################################################################
 # First version added to repository was 0.4, added as 1.0 .
diff --git a/kate/data/ocaml.xml b/kate/data/ocaml.xml
index 364cbdd9d..15a876f37 100644
--- a/kate/data/ocaml.xml
+++ b/kate/data/ocaml.xml
@@ -17,7 +17,7 @@
           extensions="*.ml;*.mli"
           mimetype=""
           section="Sources"
-          version="2.01"
+          version="3"
           priority="10"
           kateversion="2.4"
           author="Glyn Webster (glynwebster@orcon.net.nz) and Vincent Hugot (vincent.hugot@gmail.com)"
diff --git a/kate/data/ocamllex.xml b/kate/data/ocamllex.xml
index f3c32e70a..ba078e829 100644
--- a/kate/data/ocamllex.xml
+++ b/kate/data/ocamllex.xml
@@ -11,7 +11,7 @@
           section="Sources"
           extensions="*.mll"
           mimetype=""
-          version="2.02"
+          version="3"
           kateversion="2.4"
           priority="10"
           author="Glyn Webster (glynwebster@orcon.net.nz) and Vincent Hugot (vincent.hugot@gmail.com)"
diff --git a/kate/data/ocamlyacc.xml b/kate/data/ocamlyacc.xml
index a5df2823d..620db8d55 100644
--- a/kate/data/ocamlyacc.xml
+++ b/kate/data/ocamlyacc.xml
@@ -14,7 +14,7 @@
           section="Sources"
           extensions="*.mly"
           mimetype=""
-          version="2.02"
+          version="3"
           kateversion="2.4"
           priority="10"
           author="Glyn Webster (glynwebster@orcon.net.nz) and Vincent Hugot (vincent.hugot@gmail.com)"
diff --git a/kate/data/opal.xml b/kate/data/opal.xml
index 6bd92ae01..e390d13be 100644
--- a/kate/data/opal.xml
+++ b/kate/data/opal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="OPAL" version="1.1" kateversion="2.3" section="Sources" extensions="*.impl;*.sign" mimetype="" author="Sebastian Pipping (webmaster@hartwork.org)">
+<language name="OPAL" version="2" kateversion="2.3" section="Sources" extensions="*.impl;*.sign" mimetype="" author="Sebastian Pipping (webmaster@hartwork.org)">
 
 	<highlighting>
 
diff --git a/kate/data/pango.xml b/kate/data/pango.xml
index 0a9fcba82..e439e0664 100644
--- a/kate/data/pango.xml
+++ b/kate/data/pango.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Pango" version="0.1" kateversion="2.4" section="Markup" extensions="" mimetype=""  author="Jonathan Schmidt-Domniné &lt;devel@the-user.org&gt;" license="LGPL" priority="10">
+<language name="Pango" version="2" kateversion="2.4" section="Markup" extensions="" mimetype=""  author="Jonathan Schmidt-Domniné &lt;devel@the-user.org&gt;" license="LGPL" priority="10">
 
 <highlighting>
     
@@ -145,7 +145,7 @@
   <itemData name="Normal Text" defStyleNum="dsNormal" />
   <itemData name="Element" defStyleNum="dsKeyword" />
   <itemData name="Key" defStyleNum="dsOthers" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" />
+  <itemData name="Value" defStyleNum="dsString" />
   <itemData name="Decimal" defStyleNum="dsDecVal" />
   <itemData name="Color" defStyleNum="dsFloat" />
   <itemData name="String" defStyleNum="dsString" />
diff --git a/kate/data/perl.xml b/kate/data/perl.xml
index bbbf4c9d7..535c82003 100644
--- a/kate/data/perl.xml
+++ b/kate/data/perl.xml
@@ -39,7 +39,7 @@
 
    Enhance tr/// and y/// support.
 -->
-<language name="Perl" version="1.32-1" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPL">
+<language name="Perl" version="2-1" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> if </item>
diff --git a/kate/data/pgn.xml b/kate/data/pgn.xml
index 4ac31de1e..05c277dd2 100644
--- a/kate/data/pgn.xml
+++ b/kate/data/pgn.xml
@@ -12,7 +12,7 @@
     - Know bugs:
     * None.
 -->
-<language name="PGN" version="2.01-1" kateversion="2.3" section="Other" extensions="*.pgn;*.PGN" priority="5" mimetype="" casesensitive="1" author="Ruben Carlo Benante (dr.beco@gmail.com)" license="GNU/GPL">
+<language name="PGN" version="3-1" kateversion="2.3" section="Other" extensions="*.pgn;*.PGN" priority="5" mimetype="" casesensitive="1" author="Ruben Carlo Benante (dr.beco@gmail.com)" license="GNU/GPL">
 <highlighting>
   <list name="keywords_list">
     <item> Event </item>
diff --git a/kate/data/picsrc.xml b/kate/data/picsrc.xml
index a57b26cfa..39964a7bb 100644
--- a/kate/data/picsrc.xml
+++ b/kate/data/picsrc.xml
@@ -8,7 +8,7 @@
   * Updated for 16-bit devices, etc.: Laurence Withers <lwithers@users.sf.net>
 -->
 
-<language name="PicAsm" version="1.07" kateversion="2.3" section="Assembler" extensions="*.src;*.SRC;*.asm;*.ASM;*.pic;*.PIC" mimetype="text/x-PicSrc;text/x-PicHdr" author="Alain GIBAUD (alain.gibaud@univ-valenciennes.fr)" license="LGPL">
+<language name="PicAsm" version="2" kateversion="2.3" section="Assembler" extensions="*.src;*.SRC;*.asm;*.ASM;*.pic;*.PIC" mimetype="text/x-PicSrc;text/x-PicHdr" author="Alain GIBAUD (alain.gibaud@univ-valenciennes.fr)" license="LGPL">
   
   <highlighting>
     <list name="directives">
diff --git a/kate/data/pike.xml b/kate/data/pike.xml
index 461b0c17b..eda28eaa1 100644
--- a/kate/data/pike.xml
+++ b/kate/data/pike.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- FIXME: Find a way to prevent ranges (e.g. [1..] or [0..99]) from matching as floats. -pp -->
-<language name="Pike" version="1.07" kateversion="2.4" section="Scripts" extensions="*.pike" mimetype="application/x-pike;text/x-pike" casesensitive="1" author="Paul Pogonyshev" license="">
+<language name="Pike" version="2" kateversion="2.4" section="Scripts" extensions="*.pike" mimetype="application/x-pike;text/x-pike" casesensitive="1" author="Paul Pogonyshev" license="">
   <highlighting>
     <list name="keywords">
       <item> break </item>
diff --git a/kate/data/postscript.xml b/kate/data/postscript.xml
index 114f505d8..4fcabbd7e 100644
--- a/kate/data/postscript.xml
+++ b/kate/data/postscript.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="PostScript" version="1.01" kateversion="2.2" section="Markup" extensions="*.ps;*.ai;*.eps" mimetype="application/postscript">
+<language name="PostScript" version="2" kateversion="2.2" section="Markup" extensions="*.ps;*.ai;*.eps" mimetype="application/postscript">
 <highlighting>
 	<list name="keywords">
 		<item> abs </item>
diff --git a/kate/data/povray.xml b/kate/data/povray.xml
index 83899220a..5594ca5bf 100644
--- a/kate/data/povray.xml
+++ b/kate/data/povray.xml
@@ -6,7 +6,7 @@
 <!-- of variable and macro declarations                         -->
 <!-- v1.1: added MegaPOV 1.2.1 keywords (Febuary 2006)          -->
 <!-- update to POV-Ray 3.7, Jan 2014, Nikolaus Klepp <dr.klepp@gmx.at> -->
-<language name="POV-Ray" version="1.2.1" kateversion="2.5" section="Other" extensions="*.inc;*.pov" mimetype="text/x-povray-script;text/x-povray-include" author="Christoph Hormann (chris_hormann@gmx.de)" license="LGPL" priority="2">
+<language name="POV-Ray" version="3-1" kateversion="2.5" section="Other" extensions="*.inc;*.pov" mimetype="text/x-povray-script;text/x-povray-include" author="Christoph Hormann (chris_hormann@gmx.de)" license="LGPL" priority="2">
 	<highlighting>
 		<list name="keywords">
 			<item> aa_level </item>
diff --git a/kate/data/ppd.xml b/kate/data/ppd.xml
index cfe9a77aa..96b334eb9 100644
--- a/kate/data/ppd.xml
+++ b/kate/data/ppd.xml
@@ -9,7 +9,7 @@ The following documentation is available for PPD:
 - CUPS PPD Extensions: http://www.cups.org/documentation.php/doc-1.4/spec-ppd.html
 -->
 
-<language name="PostScript Printer Description" version="0.2" kateversion="2.4" section="Markup" extensions="*.ppd" author="Lukas Sommer" mimetype="application/vnd.cups-ppd" license="public domain">
+<language name="PostScript Printer Description" version="1" kateversion="2.4" section="Markup" extensions="*.ppd" author="Lukas Sommer" mimetype="application/vnd.cups-ppd" license="public domain">
 
     <highlighting>
 
diff --git a/kate/data/praat.xml b/kate/data/praat.xml
new file mode 100644
index 000000000..39084ba2f
--- /dev/null
+++ b/kate/data/praat.xml
@@ -0,0 +1,510 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+  <!ENTITY B '([^a-zA-Z0-9\._"&apos;\$#\[:\(]|\s|^|$)'>
+]>
+<!--
+   This file is part of the TDE project
+   Copyright (C) 2016 José Joaquín Atria <jjatria@gmail.com>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License version 2 as published by the Free Software Foundation.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+-->
+<language name="Praat" version="1-1" kateversion="2.4" section="Scripts" extensions="*.Praat;*.praat;*.psc;*.praat-script;*.praatscript;*.proc" author="Jose Joaquín Atria (jjatria@gmail.com)" license="LGPL">
+  <highlighting>
+    <list name="keywords">
+      <item>assert</item>
+      <item>clearinfo</item>
+      <item>demo</item>
+      <item>elif</item>
+      <item>else</item>
+      <item>elsif</item>
+      <item>from</item>
+      <item>minus</item>
+      <item>nocheck</item>
+      <item>noprogress</item>
+      <item>nowarn</item>
+      <item>plus</item>
+      <item>select</item>
+      <item>stopwatch</item>
+      <item>then</item>
+      <item>to</item>
+    </list>
+    <list name="functions_string">
+      <item>backslashTrigraphsToUnicode$</item>
+      <item>chooseDirectory$</item>
+      <item>chooseReadFile$</item>
+      <item>chooseWriteFile$</item>
+      <item>date$</item>
+      <item>demoKey$</item>
+      <item>do$</item>
+      <item>environment$</item>
+      <item>extractLine$</item>
+      <item>extractWord$</item>
+      <item>fixed$</item>
+      <item>info$</item>
+      <item>left$</item>
+      <item>mid$</item>
+      <item>percent$</item>
+      <item>readFile$</item>
+      <item>replace$</item>
+      <item>replace_regex$</item>
+      <item>right$</item>
+      <item>selected$</item>
+      <item>string$</item>
+    </list>
+    <list name="functions_numeric">
+      <item>abs</item>
+      <item>appendFile</item>
+      <item>appendFileLine</item>
+      <item>appendInfo</item>
+      <item>appendInfoLine</item>
+      <item>arccos</item>
+      <item>arccosh</item>
+      <item>arcsin</item>
+      <item>arcsinh</item>
+      <item>arctan</item>
+      <item>arctan2</item>
+      <item>arctanh</item>
+      <item>barkToHertz</item>
+      <item>beginPause</item>
+      <item>beginSendPraat</item>
+      <item>besselI</item>
+      <item>besselK</item>
+      <item>beta</item>
+      <item>beta2</item>
+      <item>binomialP</item>
+      <item>binomialQ</item>
+      <item>boolean</item>
+      <item>ceiling</item>
+      <item>chiSquareP</item>
+      <item>chiSquareQ</item>
+      <item>choice</item>
+      <item>comment</item>
+      <item>cos</item>
+      <item>cosh</item>
+      <item>createDirectory</item>
+      <item>deleteFile</item>
+      <item>demoClicked</item>
+      <item>demoClickedIn</item>
+      <item>demoCommandKeyPressed</item>
+      <item>demoExtraControlKeyPressed</item>
+      <item>demoInput</item>
+      <item>demoKeyPressed</item>
+      <item>demoOptionKeyPressed</item>
+      <item>demoShiftKeyPressed</item>
+      <item>demoShow</item>
+      <item>demoWaitForInput</item>
+      <item>demoWindowTitle</item>
+      <item>demoX</item>
+      <item>demoY</item>
+      <item>differenceLimensToPhon</item>
+      <item>do</item>
+      <item>editor</item>
+      <item>endPause</item>
+      <item>endSendPraat</item>
+      <item>endsWith</item>
+      <item>erb</item>
+      <item>erbToHertz</item>
+      <item>erf</item>
+      <item>erfc</item>
+      <item>exitScript</item>
+      <item>exp</item>
+      <item>extractNumber</item>
+      <item>fileReadable</item>
+      <item>fisherP</item>
+      <item>fisherQ</item>
+      <item>floor</item>
+      <item>gaussP</item>
+      <item>gaussQ</item>
+      <item>hash</item>
+      <item>hertzToBark</item>
+      <item>hertzToErb</item>
+      <item>hertzToMel</item>
+      <item>hertzToSemitones</item>
+      <item>imax</item>
+      <item>imin</item>
+      <item>incompleteBeta</item>
+      <item>incompleteGammaP</item>
+      <item>index</item>
+      <item>index_regex</item>
+      <item>integer</item>
+      <item>invBinomialP</item>
+      <item>invBinomialQ</item>
+      <item>invChiSquareQ</item>
+      <item>invFisherQ</item>
+      <item>invGaussQ</item>
+      <item>invSigmoid</item>
+      <item>invStudentQ</item>
+      <item>length</item>
+      <item>ln</item>
+      <item>lnBeta</item>
+      <item>lnGamma</item>
+      <item>log10</item>
+      <item>log2</item>
+      <item>max</item>
+      <item>melToHertz</item>
+      <item>min</item>
+      <item>minusObject</item>
+      <item>natural</item>
+      <item>number</item>
+      <item>numberOfColumns</item>
+      <item>numberOfRows</item>
+      <item>numberOfSelected</item>
+      <item>objectsAreIdentical</item>
+      <item>option</item>
+      <item>optionMenu</item>
+      <item>pauseScript</item>
+      <item>phonToDifferenceLimens</item>
+      <item>plusObject</item>
+      <item>positive</item>
+      <item>randomBinomial</item>
+      <item>randomGauss</item>
+      <item>randomInteger</item>
+      <item>randomPoisson</item>
+      <item>randomUniform</item>
+      <item>real</item>
+      <item>readFile</item>
+      <item>removeObject</item>
+      <item>rindex</item>
+      <item>rindex_regex</item>
+      <item>round</item>
+      <item>runScript</item>
+      <item>runSystem</item>
+      <item>runSystem_nocheck</item>
+      <item>selectObject</item>
+      <item>selected</item>
+      <item>semitonesToHertz</item>
+      <item>sentence</item>
+      <item>sentencetext</item>
+      <item>sigmoid</item>
+      <item>sin</item>
+      <item>sinc</item>
+      <item>sincpi</item>
+      <item>sinh</item>
+      <item>soundPressureToPhon</item>
+      <item>sqrt</item>
+      <item>startsWith</item>
+      <item>studentP</item>
+      <item>studentQ</item>
+      <item>tan</item>
+      <item>tanh</item>
+      <item>text</item>
+      <item>variableExists</item>
+      <item>word</item>
+      <item>writeFile</item>
+      <item>writeFileLine</item>
+      <item>writeInfo</item>
+      <item>writeInfoLine</item>
+  </list>
+    <list name="functions_array">
+      <item>linear#</item>
+      <item>randomGauss#</item>
+      <item>randomInteger#</item>
+      <item>randomUniform#</item>
+      <item>zero#</item>
+    </list>
+    <list name="variables_numeric">
+      <item>all</item>
+      <item>average</item>
+      <item>e</item>
+      <item>left</item>
+      <item>macintosh</item>
+      <item>mono</item>
+      <item>pi</item>
+      <item>praatVersion</item>
+      <item>right</item>
+      <item>stereo</item>
+      <item>undefined</item>
+      <item>unix</item>
+      <item>windows</item>
+   </list>
+    <list name="variables_string">
+      <item>praatVersion$</item>
+      <item>tab$</item>
+      <item>shellDirectory$</item>
+      <item>homeDirectory$</item>
+      <item>preferencesDirectory$</item>
+      <item>newline$</item>
+      <item>temporaryDirectory$</item>
+      <item>defaultDirectory$</item>
+    </list>
+    <contexts>
+      <context name="normal" attribute="normal" lineEndContext="#pop"  >
+        <DetectChar char='#' attribute="comment" context="comment" firstNonSpace="true" />
+
+        <IncludeRules context="function check" />
+
+        <DetectChar char='@' attribute="function" context="procedure name" firstNonSpace="true" />
+
+        <RegExpr String="call&B;" attribute="keyword" context="function word to shorthand arguments" firstNonSpace="true" />
+        <RegExpr String="include&B;" attribute="keyword" context="unquoted string" firstNonSpace="true" />
+
+        <RegExpr String="&B;?if&B;" attribute="keyword" beginRegion="if" />
+        <RegExpr String="endif&B;" attribute="keyword" endRegion="if" firstNonSpace="true" />
+        <RegExpr String="&B;?fi&B;" attribute="keyword" endRegion="if" />
+
+        <RegExpr String="for&B;" attribute="keyword" beginRegion="for" firstNonSpace="true" />
+        <RegExpr String="endfor&B;" attribute="keyword" endRegion="for" firstNonSpace="true" />
+
+        <RegExpr String="while&B;" attribute="keyword" beginRegion="while" firstNonSpace="true" />
+        <RegExpr String="endwhile&B;" attribute="keyword" endRegion="while" firstNonSpace="true" />
+
+        <RegExpr String="repeat&B;" attribute="keyword" beginRegion="repeat" firstNonSpace="true" />
+        <RegExpr String="until&B;" attribute="keyword" endRegion="repeat" firstNonSpace="true" />
+
+        <RegExpr String="procedure&B;" attribute="keyword" context="procedure name" beginRegion="procedure" firstNonSpace="true" />
+        <RegExpr String="endproc&B;" attribute="keyword" endRegion="procedure" firstNonSpace="true" />
+
+        <StringDetect String="select all" attribute="keyword" firstNonSpace="true" />
+        <keyword String="keywords" attribute="keyword" />
+
+        <RegExpr String="&B;print(line|tab)?&B;" attribute="keyword" context="unquoted string" />
+        <RegExpr String="&B;echo&B;" attribute="keyword" context="unquoted string" />
+        <RegExpr String="&B;exit&B;" attribute="keyword" context="unquoted string" />
+        <RegExpr String="&B;asserterror&B;" attribute="keyword" context="unquoted string" />
+        <RegExpr String="&B;pause&B;" attribute="keyword" context="unquoted string" />
+        <RegExpr String="&B;send(praat|socket)&B;" attribute="keyword" context="unquoted string" />
+        <RegExpr String="&B;execute&B;" attribute="keyword" context="unquoted string" />
+        <RegExpr String="&B;editor&B;" attribute="keyword" context="unquoted string" beginRegion="editor" />
+        <RegExpr String="&B;endeditor&B;" attribute="keyword" endRegion="editor" />
+
+        <RegExpr String="form&B;" attribute="keyword" context="old form definition" firstNonSpace="true" beginRegion="form" />
+
+        <RegExpr String="goto&B;" attribute="keyword" context="label"  firstNonSpace="true" />
+        <RegExpr String="label&B;" attribute="keyword" context="label" firstNonSpace="true" />
+
+        <DetectChar char='"' attribute="string" context="quoted string" />
+        <IncludeRules context="expansion" />
+
+        <IncludeRules context="operator" />
+        <IncludeRules context="variable name" />
+        <IncludeRules context="number" />
+
+        <RegExpr String="\b[A-Z]" attribute="command" context="command" />
+
+        <DetectChar char=';' attribute="comment" context="comment" />
+      </context>
+
+      <context name="label" attribute="variable" lineEndContext="#pop" />
+
+      <context name="old form definition" attribute="string" lineEndContext="#pop!old form" />
+
+      <context name="old form" attribute="normal" lineEndContext="#stay">
+        <DetectChar char='#' attribute="comment" context="comment" firstNonSpace="true" />
+
+        <RegExpr String="choice&B;" attribute="keyword" context="normal word with colon to number" firstNonSpace="true" />
+        <RegExpr String="optionmenu&B;" attribute="keyword" context="normal word with colon to number" firstNonSpace="true" />
+        <RegExpr String="option&B;" attribute="keyword" context="unquoted string" firstNonSpace="true" />
+        <RegExpr String="button&B;" attribute="keyword" context="unquoted string" firstNonSpace="true" />
+
+        <RegExpr String="sentence&B;" attribute="keyword" context="normal word to string" firstNonSpace="true" />
+        <RegExpr String="text&B;" attribute="keyword" context="normal word to string" firstNonSpace="true" />
+
+        <RegExpr String="word&B;" attribute="keyword" context="normal word to string word" firstNonSpace="true" />
+
+        <RegExpr String="comment&B;" attribute="keyword" context="unquoted string" firstNonSpace="true" />
+
+        <RegExpr String="real&B;" attribute="keyword" context="number" firstNonSpace="true" />
+        <RegExpr String="natural&B;" attribute="keyword" context="number" firstNonSpace="true" />
+        <RegExpr String="positive&B;" attribute="keyword" context="number" firstNonSpace="true" />
+        <RegExpr String="integer&B;" attribute="keyword" context="number" firstNonSpace="true" />
+
+        <RegExpr String="boolean&B;" attribute="keyword" context="normal word to variable" firstNonSpace="true" />
+
+        <RegExpr String="endform&B;" attribute="keyword" context="#pop" endRegion="form" firstNonSpace="true" />
+      </context>
+
+      <context name="operator" attribute="operator" lineEndContext="#pop" >
+        <RegExpr String="([+\/*&lt;>=!-]=?|[&amp;*|][&amp;*|]?|\^|&lt;>)" attribute="operator" />
+        <RegExpr String="\.(and|or|not|div|mod)" attribute="normal" />
+        <RegExpr String="(and|or|not|div|mod)\." attribute="normal" />
+        <WordDetect String="and" attribute="operator" />
+        <WordDetect String="or"  attribute="operator" />
+        <WordDetect String="not" attribute="operator" />
+        <WordDetect String="div" attribute="operator" />
+        <WordDetect String="mod" attribute="operator" />
+      </context>
+
+      <context name="command" attribute="command" lineEndContext="#pop" >
+        <IncludeRules context="expansion" />
+        <StringDetect String="..." attribute="command" context="shorthand arguments" />
+        <DetectChar char=":" attribute="command" context="#pop" />
+      </context>
+
+      <context name="shorthand arguments" attribute="normal" lineEndContext="#pop#pop" >
+        <IncludeRules context="variable name" />
+        <IncludeRules context="operator" />
+        <IncludeRules context="number" />
+        <DetectChar char='"' attribute="string" context="quoted string" />
+      </context>
+
+      <context name="variable name" attribute="normal" lineEndContext="#pop" >
+        <IncludeRules context="operator" />
+        <IncludeRules context="number" />
+        <keyword String="variables_numeric" attribute="variable" />
+        <keyword String="variables_string" attribute="variable" />
+
+        <RegExpr String="\b[A-Z][a-zA-Z]+_" attribute="object.attribute" context="object reference" />
+
+      </context>
+
+      <context name="object reference" attribute="object.attribute" lineEndContext="#pop#pop" >
+        <DetectChar char="." attribute="object.attribute" context="#pop#pop!object attributes" lookAhead="true" />
+
+        <IncludeRules context="expansion" />
+
+        <DetectChar char="$" attribute="object.attribute" />
+        <DetectChar char="[" attribute="normal" context="#pop#pop" />
+      </context>
+
+      <context name="object attributes" attribute="normal" lineEndContext="#pop" >
+        <RegExpr String="\.ncol&B;" attribute="object.attribute" context="#pop" />
+        <RegExpr String="\.nrow&B;" attribute="object.attribute" context="#pop" />
+        <RegExpr String="\.xmin&B;" attribute="object.attribute" context="#pop" />
+        <RegExpr String="\.ymin&B;" attribute="object.attribute" context="#pop" />
+        <RegExpr String="\.xmax&B;" attribute="object.attribute" context="#pop" />
+        <RegExpr String="\.ymax&B;" attribute="object.attribute" context="#pop" />
+        <RegExpr String="\.nx&B;" attribute="object.attribute" context="#pop" />
+        <RegExpr String="\.ny&B;" attribute="object.attribute" context="#pop" />
+        <RegExpr String="\.dx&B;" attribute="object.attribute" context="#pop" />
+        <RegExpr String="\.dy&B;" attribute="object.attribute" context="#pop" />
+      </context>
+
+      <context name="normal word with colon to number" attribute="normal" lineEndContext="#pop" >
+        <DetectChar char=":" attribute="normal" context="number" />
+      </context>
+
+      <context name="normal word to variable" attribute="normal" lineEndContext="#pop" >
+        <RegExpr String="\b\w+\b" attribute="normal" context="variable" />
+      </context>
+
+      <context name="variable" attribute="variable" lineEndContext="#pop" />
+
+      <context name="number" attribute="normal" lineEndContext="#pop" >
+        <IncludeRules context="operator" />
+        <RegExpr String="\b\d+(\.\d*)?([eE][-+]?\d+)?%?" attribute="number" />
+      </context>
+
+      <context name="normal word to string word" attribute="normal" lineEndContext="#pop" >
+        <RegExpr String="\b\w+\b" attribute="normal" context="string word" />
+      </context>
+
+      <context name="normal word to string" attribute="normal" lineEndContext="#pop" >
+        <RegExpr String="\b\w+\b" attribute="normal" context="unquoted string" />
+      </context>
+
+      <context name="string word" attribute="string" lineEndContext="#pop" >
+        <RegExpr String="\b\w+\b" attribute="string" context="ignore" />
+      </context>
+
+      <context name="ignore" attribute="normal" lineEndContext="#pop" />
+
+      <context name="comment" attribute="comment" lineEndContext="#pop" />
+
+      <context name="quoted string" attribute="string" lineEndContext="broken quoted string" >
+        <IncludeRules context="expansion" />
+        <DetectChar char='"' attribute="string" context="#pop" />
+      </context>
+
+      <context name="unquoted string" attribute="string" lineEndContext="broken unquoted string" >
+        <IncludeRules context="expansion" />
+      </context>
+
+      <context name="expansion" attribute="normal" lineEndContext="#pop" >
+        <RegExpr String="'[^\[\]'&quot;]+(\[([\w\d,]+|&quot;[\w\d,]+&quot;)\])?'" attribute="expansion" />
+      </context>
+
+      <context name="broken unquoted string" attribute="string" lineEndContext="#stay" >
+        <DetectSpaces attribute="normal" />
+        <StringDetect String="..." attribute="normal" context="#pop" firstNonSpace="true" />
+        <IncludeRules context="expansion" />
+        <RegExpr String="[\w\d#@;.]" context="#pop#pop" firstNonSpace="true" lookAhead="true" />
+      </context>
+
+      <context name="broken quoted string" attribute="string" lineEndContext="#stay" >
+        <IncludeRules context="broken unquoted string" />
+        <DetectChar char='"' attribute="string" context="#pop#pop" />
+      </context>
+
+      <context name="function check" attribute="normal" lineEndContext="#pop" >
+        <keyword String="functions_numeric" attribute="normal" context="numeric function check" lookAhead="true" />
+        <keyword String="functions_string" attribute="normal" context="string function check" lookAhead="true" />
+        <keyword String="functions_array" attribute="normal" context="array function check" lookAhead="true" />
+      </context>
+
+      <context name="array function check" attribute="normal" lineEndContext="#pop" >
+        <RegExpr String="[a-zA-Z0-9_]+# *[:(]" attribute="normal" context="function call" lookAhead="true" />
+        <DetectChar char=" " context="#pop#pop" />
+      </context>
+
+      <context name="string function check" attribute="normal" lineEndContext="#pop" >
+        <RegExpr String="[a-zA-Z0-9_]+\$ *[:(]" attribute="normal" context="function call" lookAhead="true" />
+        <DetectChar char=" " context="#pop#pop" />
+      </context>
+
+      <context name="numeric function check" attribute="normal" lineEndContext="#pop" >
+        <RegExpr String="[a-zA-Z0-9_]+ *[:(]" attribute="normal" context="function call" lookAhead="true" />
+        <RegExpr String="&B;editor&B;" attribute="keyword" context="#pop#pop!unquoted string" beginRegion="editor" />
+        <DetectChar char=" " context="#pop#pop" />
+      </context>
+
+      <context name="function call" attribute="function" lineEndContext="#pop" >
+        <RegExpr String="&B;beginSendPraat&B;" beginRegion="sendpraat" />
+        <RegExpr String="&B;endSendPraat&B;" endRegion="sendpraat" />
+
+        <RegExpr String="&B;beginPause&B;" beginRegion="pause" />
+        <RegExpr String="&B;endPause&B;" endRegion="pause" />
+
+        <DetectSpaces attribute="normal" />
+        <DetectChar char=":" attribute="normal" context="#pop#pop#pop" />
+        <DetectChar char="(" attribute="normal" context="#pop#pop#pop" />
+      </context>
+
+      <context name="procedure name" attribute="function" lineEndContext="#pop" >
+        <DetectChar char=":" attribute="normal" context="#pop" />
+        <DetectChar char="(" attribute="normal" context="#pop" />
+        <IncludeRules context="expansion" />
+        <DetectSpaces attribute="normal" context="#pop" />
+      </context>
+
+      <context name="function word to shorthand arguments" attribute="function" lineEndContext="#pop" >
+        <DetectChar char=":" attribute="normal" context="#pop" />
+        <DetectChar char="(" attribute="normal" context="#pop" />
+        <IncludeRules context="expansion" />
+        <DetectSpaces attribute="normal" context="#pop!shorthand arguments" />
+      </context>
+
+    </contexts>
+    <itemDatas>
+      <itemData name="normal" defStyleNum="dsNormal" />
+      <itemData name="number" defStyleNum="dsDecVal" />
+      <itemData name="object.attribute" defStyleNum="dsDecVal" />
+      <itemData name="variable" defStyleNum="dsDataType" />
+      <itemData name="keyword" defStyleNum="dsKeyword" />
+      <itemData name="expansion" defStyleNum="dsSpecialString" />
+      <itemData name="string" defStyleNum="dsString" />
+      <itemData name="command" defStyleNum="dsFunction" />
+      <itemData name="function" defStyleNum="dsFunction" />
+      <itemData name="operator" defStyleNum="dsOperator" />
+      <itemData name="comment" defStyleNum="dsComment" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="#" />
+    </comments>
+    <keywords casesensitive="true" weakDeliminator="._#$" />
+  </general>
+</language>
diff --git a/kate/data/progress.xml b/kate/data/progress.xml
index 73a5c4514..46a105c35 100644
--- a/kate/data/progress.xml
+++ b/kate/data/progress.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="progress" version="1.10" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i;*.cls;" author="Rares Stanciulescu (rstanciu@operamail.com)" license="GPL">
+<language name="progress" version="2" kateversion="2.4" section="Database" extensions="*.p;*.w;*.i;*.cls;" author="Rares Stanciulescu (rstanciu@operamail.com)" license="GPL">
 
 <highlighting>
 
diff --git a/kate/data/purebasic.xml b/kate/data/purebasic.xml
index 433e77704..b9ad1b5ba 100644
--- a/kate/data/purebasic.xml
+++ b/kate/data/purebasic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd">
-<language name="PureBasic" version="5.31" kateversion="2.3" section="Sources" extensions="*.pb;*.pbi" mimetype="text/x-purebasic" author="Alexander Clay (Tuireann@EpicBasic.org);Sven Langenkamp (ace@kylixforum.de)" license="LGPL" priority="1" >
+<language name="PureBasic" version="6" kateversion="2.3" section="Sources" extensions="*.pb;*.pbi" mimetype="text/x-purebasic" author="Alexander Clay (Tuireann@EpicBasic.org);Sven Langenkamp (ace@kylixforum.de)" license="LGPL" priority="1" >
   <highlighting>
     <list name="keywords">
       <item> Break </item>
diff --git a/kate/data/q.xml b/kate/data/q.xml
index a470e5ef7..5d7ac676b 100644
--- a/kate/data/q.xml
+++ b/kate/data/q.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="q" version="1.01" kateversion="2.3" section="Scripts" extensions="*.q" license="LGPL2+" author="James Schmitz (james.schmitz@gmail.com)">
+<language name="q" version="2" kateversion="2.3" section="Scripts" extensions="*.q" license="LGPL2+" author="James Schmitz (james.schmitz@gmail.com)">
 <highlighting>
     <list name="DotQ">
       <item>.Q.addmonths</item>
diff --git a/kate/data/r.xml b/kate/data/r.xml
index 9a5ef8168..e7188002a 100644
--- a/kate/data/r.xml
+++ b/kate/data/r.xml
@@ -7,7 +7,7 @@
 	R      : http://www.r-project.org/
 	RKWard : http://rkward.sourceforge.net/
 	-->
-<language version="2.08-1" kateversion="2.3" name="R Script" section="Scripts" extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPL">
+<language version="3-1" kateversion="2.3" name="R Script" section="Scripts" extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPL">
 <highlighting>
 
 	<list name="controls">
diff --git a/kate/data/rapidq.xml b/kate/data/rapidq.xml
index 3f90adbbe..67a7a8e97 100644
--- a/kate/data/rapidq.xml
+++ b/kate/data/rapidq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="RapidQ" version="1.01" kateversion="2.3" section="Sources" extensions="*.rqb" author="Tiberiu Dragulinescu" license="LGPL">
+<language name="RapidQ" version="2" kateversion="2.3" section="Sources" extensions="*.rqb" author="Tiberiu Dragulinescu" license="LGPL">
     <highlighting>
         <list name="keywords">
 		<item>abs</item>
diff --git a/kate/data/relaxng.xml b/kate/data/relaxng.xml
index f62dcaff3..fe593dc85 100644
--- a/kate/data/relaxng.xml
+++ b/kate/data/relaxng.xml
@@ -16,7 +16,7 @@
    - Namespace rules
 -->
 
-<language version="0.8"
+<language version="1"
           kateversion="2.4"
           name="RELAX NG"
           section="Markup"
diff --git a/kate/data/relaxngcompact.xml b/kate/data/relaxngcompact.xml
index a44012fba..847c2a073 100644
--- a/kate/data/relaxngcompact.xml
+++ b/kate/data/relaxngcompact.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="RelaxNG-Compact" version="0.2" kateversion="2.4" section="Markup" extensions="*.rnc" casesensitive="1" author="Rintze Zelle" license="LGPL">
+<language name="RelaxNG-Compact" version="1" kateversion="2.4" section="Markup" extensions="*.rnc" casesensitive="1" author="Rintze Zelle" license="LGPL">
   <highlighting>
     <list name="Keywords">
       <item> default </item>
diff --git a/kate/data/replicode.xml b/kate/data/replicode.xml
index 5c191215d..aadc43a03 100644
--- a/kate/data/replicode.xml
+++ b/kate/data/replicode.xml
@@ -11,7 +11,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 -->
-<language version="1.00" kateversion="2.4" name="Replicode" section="Scientific" extensions="*.replicode" author="Martin Sandsmark">
+<language version="2" kateversion="2.4" name="Replicode" section="Scientific" extensions="*.replicode" author="Martin Sandsmark">
     <highlighting>
         <list name="operators">
             <item>_now</item>
diff --git a/kate/data/rest.xml b/kate/data/rest.xml
index b74e7935e..13639650c 100644
--- a/kate/data/rest.xml
+++ b/kate/data/rest.xml
@@ -11,7 +11,7 @@
   Copyright 2010 Matt Williams (matt@milliams.com)
   Copyright 2014 Matthew Woehlke (mw_triad@users.sourceforge.net)
   -->
-<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="1.5" kateversion="2.4" casesensitive="1">
+<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="2" kateversion="2.4" casesensitive="1">
 
   <highlighting>
 
diff --git a/kate/data/rexx.xml b/kate/data/rexx.xml
index 29bd668e7..52a68e0e2 100644
--- a/kate/data/rexx.xml
+++ b/kate/data/rexx.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="REXX" version="1.01" kateversion="2.2" section="Scripts" extensions="*.rex" mimetype="">
+<language name="REXX" version="2" kateversion="2.2" section="Scripts" extensions="*.rex" mimetype="">
   <highlighting>
     <list name="instructions">
       <item> arg </item>
diff --git a/kate/data/rhtml.xml b/kate/data/rhtml.xml
index c5863dda0..a966c23cc 100644
--- a/kate/data/rhtml.xml
+++ b/kate/data/rhtml.xml
@@ -44,7 +44,7 @@
 -->
 	
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
-<language name="Ruby/Rails/RHTML" version="1.01" kateversion="2.4" section="Markup" extensions="*.rhtml;*.html.erb" mimetype="" author="Richard Dale rdale@foton.es" license="LGPL">
+<language name="Ruby/Rails/RHTML" version="3" kateversion="2.4" section="Markup" extensions="*.rhtml;*.html.erb" mimetype="" author="Richard Dale rdale@foton.es" license="LGPL">
 	
 	<highlighting>
 	
@@ -1217,7 +1217,7 @@
 			<itemData name="Doctype" defStyleNum="dsDataType" bold="1" />
 			<itemData name="Element" defStyleNum="dsKeyword" />
 			<itemData name="Attribute" defStyleNum="dsOthers" />
-			<itemData name="Value" defStyleNum="dsString" color="#a00" />
+			<itemData name="Value" defStyleNum="dsString" />
 			<itemData name="EntityRef" defStyleNum="dsDecVal" />
 			<itemData name="PEntityRef" defStyleNum="dsDecVal" />
 			<itemData name="Error" defStyleNum="dsError" />
diff --git a/kate/data/rib.xml b/kate/data/rib.xml
index 8472016a9..8ec2d080c 100644
--- a/kate/data/rib.xml
+++ b/kate/data/rib.xml
@@ -5,7 +5,7 @@
 <!--By David Williams-->
 <!--Email david@david-williams.info-->
 
-<language name="RenderMan RIB" version="1.00" kateversion="2.3" section="Other" mimetype="" extensions="*.rib" author="David Williams &lt;david@david-williams.info&gt;" license="LGPL">
+<language name="RenderMan RIB" version="2" kateversion="2.3" section="Other" mimetype="" extensions="*.rib" author="David Williams &lt;david@david-williams.info&gt;" license="LGPL">
 	<highlighting>
 		<list name="Graphics States">
 			<item> AreaLightSource </item>
diff --git a/kate/data/roff.xml b/kate/data/roff.xml
index 5da0ddc1d..5df0f48b8 100644
--- a/kate/data/roff.xml
+++ b/kate/data/roff.xml
@@ -7,7 +7,7 @@
   <!ENTITY argsep1 "([^\\]|\\[&#37; |\^{}'`\-!?@)/,&amp;:~0E_acdeprtu])">
   <!ENTITY argsep2 "([^\\0-9]|\\[&#37;:{}'`\-_!@/cep])">
 ]>
-<language name="Roff" section="Markup" version="1.0" kateversion="2.4" extensions="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
+<language name="Roff" section="Markup" version="2" kateversion="2.4" extensions="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
 
   <highlighting>
 
diff --git a/kate/data/rpmspec.xml b/kate/data/rpmspec.xml
index 212d2c53d..094e9022d 100644
--- a/kate/data/rpmspec.xml
+++ b/kate/data/rpmspec.xml
@@ -8,7 +8,7 @@
   <!ENTITY os_conditionals_names "(ifos|ifnos)">
   <!ENTITY lookahead_whitespace_eol "(?=($| |\t))">
 ]>
-<language name="RPM Spec" version="2.04" kateversion="2.4" section="Other" extensions="*.spec" mimetype="" license="public domain">
+<language name="RPM Spec" version="3" kateversion="2.4" section="Other" extensions="*.spec" mimetype="" license="public domain">
 
 <!-- The entities "arch" and "os" are based on /usr/lib/rpm/rpmrc (in the version coming with openSUSE 11.4). -->
 
diff --git a/kate/data/rsiidl.xml b/kate/data/rsiidl.xml
index 286398710..785f64eff 100644
--- a/kate/data/rsiidl.xml
+++ b/kate/data/rsiidl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>   <!-- KATE Syntax Highlighting for RSI IDL   -->
 <!DOCTYPE language SYSTEM "language.dtd"><!-- Created by Markus Fraenz,fraenz@linmpi.mpg.de Aug 2002 -->
-<language name="RSI IDL" version="1.04" kateversion="2.3" section="Sources" extensions="*.pro" mimetype="text/x-rsiidl-src" author="Markus Fraenz (fraenz@linmpi.mpg.de)" license="">
+<language name="RSI IDL" version="2" kateversion="2.3" section="Sources" extensions="*.pro" mimetype="text/x-rsiidl-src" author="Markus Fraenz (fraenz@linmpi.mpg.de)" license="">
     <highlighting>
         <list name="reserved words">
         <item> For </item>
diff --git a/kate/data/rtf.xml b/kate/data/rtf.xml
index 50ea497bc..42ce267d5 100644
--- a/kate/data/rtf.xml
+++ b/kate/data/rtf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd" [ <!ENTITY number "([-]?\d+)"> ] >
-<language name="Rich Text Format" version="1.0" kateversion="2.4" section="Markup" extensions="*.rtf" mimetype="text/rtf;application/rtf" author="Lukas Sommer" license="LGPL version 2.1, or version 3 or later versions approved by the membership of KDE e.V.; or any other license appoved by the emembership of KDE e.V.">
+<language name="Rich Text Format" version="2" kateversion="2.4" section="Markup" extensions="*.rtf" mimetype="text/rtf;application/rtf" author="Lukas Sommer" license="LGPL version 2.1, or version 3 or later versions approved by the membership of KDE e.V.; or any other license appoved by the emembership of KDE e.V.">
 
   <highlighting>
     
diff --git a/kate/data/sather.xml b/kate/data/sather.xml
index f2349db21..4662ed23c 100644
--- a/kate/data/sather.xml
+++ b/kate/data/sather.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Sather" version="1.03" kateversion="2.2" section="Sources" extensions="*.sa" mimetype="text/x-sather-src" casesensitive="1">
+<language name="Sather" version="2" kateversion="2.2" section="Sources" extensions="*.sa" mimetype="text/x-sather-src" casesensitive="1">
         <highlighting>
                 <list name="keywords">
                         <item> and </item>
diff --git a/kate/data/scala.xml b/kate/data/scala.xml
index 6d7c1f7c9..ad332a2ce 100644
--- a/kate/data/scala.xml
+++ b/kate/data/scala.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Scala" version="1.0" kateversion="2.3" section="Sources"
+<language name="Scala" version="2" kateversion="2.3" section="Sources"
           extensions="*.scala" mimetype="text/x-scala" license="LGPL"
           author="Stephane Micheloud (stephane.micheloud@epfl.ch)">
 <!--
diff --git a/kate/data/scheme.xml b/kate/data/scheme.xml
index 4ff5086ae..a52fc91af 100644
--- a/kate/data/scheme.xml
+++ b/kate/data/scheme.xml
@@ -40,7 +40,7 @@
    guile procedures (cause then almost everything would be highlighted) I
    removed some to have a rather small but "senseful" list of highlighted words.
 -->
-<language version="1.13-1" kateversion="2.4" name="Scheme" section="Scripts" extensions="*.scm;*.ss;*.scheme;*.guile" mimetype="text/x-scheme" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" priority="9">
+<language version="2-1" kateversion="2.4" name="Scheme" section="Scripts" extensions="*.scm;*.ss;*.scheme;*.guile" mimetype="text/x-scheme" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" priority="9">
   <highlighting>
     <list name="operators">
       <item> &lt;= </item>
diff --git a/kate/data/sci.xml b/kate/data/sci.xml
index 177991e54..e2dad6cf2 100644
--- a/kate/data/sci.xml
+++ b/kate/data/sci.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="scilab" version="1.03" kateversion="2.2" section="Scientific" extensions="*.sci;*.sce" mimetype="text/x-sci">
+<language name="scilab" version="2" kateversion="2.2" section="Scientific" extensions="*.sci;*.sce" mimetype="text/x-sci">
   <highlighting>
     <list name="Structure-keywords">
       <item> do </item>
diff --git a/kate/data/sed.xml b/kate/data/sed.xml
index 095d440a1..10e4b8c17 100644
--- a/kate/data/sed.xml
+++ b/kate/data/sed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="sed" section="Scripts" version="1.0" kateversion="2.4" extensions="*.sed" mimetype="text/x-sed" author="Bart Sas (bart.sas@gmail.com)" license="GPL">
+<language name="sed" section="Scripts" version="2" kateversion="2.4" extensions="*.sed" mimetype="text/x-sed" author="Bart Sas (bart.sas@gmail.com)" license="GPL">
         <highlighting>
                 <contexts>
                         <context name="BeginningOfLine" attribute="Normal" lineEndContext="#stay">
diff --git a/kate/data/sgml.xml b/kate/data/sgml.xml
index 5d5cc4025..87f2fe340 100644
--- a/kate/data/sgml.xml
+++ b/kate/data/sgml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="SGML" version="1.02" kateversion="2.2" section="Markup" extensions="*.sgml" mimetype="text/sgml">
+<language name="SGML" version="2" kateversion="2.2" section="Markup" extensions="*.sgml" mimetype="text/sgml">
   <highlighting>
     <contexts>
        <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
diff --git a/kate/data/sieve.xml b/kate/data/sieve.xml
index 95ef08b1d..c86e3b32b 100644
--- a/kate/data/sieve.xml
+++ b/kate/data/sieve.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Highlighting for Sieve scripts (RFC 3028) written by Petter E. Stokke -->
-<language name="Sieve" version="1.05" kateversion="2.4" section="Scripts" extensions="*.siv" mimetype="application/sieve" priority="5" author="Petter E. Stokke" license="">
+<language name="Sieve" version="2" kateversion="2.4" section="Scripts" extensions="*.siv" mimetype="application/sieve" priority="5" author="Petter E. Stokke" license="">
   <highlighting>
     <list name="keywords">
       <item> require </item>
diff --git a/kate/data/sisu.xml b/kate/data/sisu.xml
index 11f9e50b2..8c8ba56f0 100644
--- a/kate/data/sisu.xml
+++ b/kate/data/sisu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="SiSU" version="1.02" section="Markup" kateversion="2.4" extensions="*.sst;*.ssm;*.ssi;*._sst;*.-sst;" author="Ralph Amissah (ralph.amissah@gmail.com)" license="LGPL" >
+<language name="SiSU" version="2" section="Markup" kateversion="2.4" extensions="*.sst;*.ssm;*.ssi;*._sst;*.-sst;" author="Ralph Amissah (ralph.amissah@gmail.com)" license="LGPL" >
   <highlighting>
     <list name="somename">
       <item> class </item>
diff --git a/kate/data/sml.xml b/kate/data/sml.xml
index 526cb8e56..3e98f7570 100644
--- a/kate/data/sml.xml
+++ b/kate/data/sml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="SML" version="1.06" kateversion="2.3" section="Sources" extensions="*.sml;*.ml" mimetype="" author="Christoph Cullmann (cullmann@kde.org)" license="LGPL">
+<language name="SML" version="2" kateversion="2.3" section="Sources" extensions="*.sml;*.ml" mimetype="" author="Christoph Cullmann (cullmann@kde.org)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> abstype </item>
diff --git a/kate/data/spice.xml b/kate/data/spice.xml
index 03b183acf..9b7da8c65 100644
--- a/kate/data/spice.xml
+++ b/kate/data/spice.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="Spice" section="Hardware" version="1.01" kateversion="2.3" extensions="*.sp;*.hsp" mimetype="text/spice" author="Steven Robson (s.a.robson@sms.ed.ac.uk) and Anders Lund" license="LGPL">
+<language name="Spice" section="Hardware" version="2" kateversion="2.3" extensions="*.sp;*.hsp" mimetype="text/spice" author="Steven Robson (s.a.robson@sms.ed.ac.uk) and Anders Lund" license="LGPL">
     <highlighting>  
           
         <contexts>
diff --git a/kate/data/sql-oracle.xml b/kate/data/sql-oracle.xml
index 822b37732..dd7245da6 100644
--- a/kate/data/sql-oracle.xml
+++ b/kate/data/sql-oracle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Oracle SQL, syntax definition based on sql.xml by Yury Lebedev -->
-<language name="SQL (Oracle)" version="1.0" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL;*.trg;*.TRG;*.spc;*.SPC;*.bdy;*.DBY" mimetype="text/x-sql" casesensitive="0" author="Andrey Karepin (egdfree@opensuse.org)" license="LGPL">
+<language name="SQL (Oracle)" version="2" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL;*.trg;*.TRG;*.spc;*.SPC;*.bdy;*.DBY" mimetype="text/x-sql" casesensitive="0" author="Andrey Karepin (egdfree@opensuse.org)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> A </item>
diff --git a/kate/data/sql-postgresql.xml b/kate/data/sql-postgresql.xml
index a8b1101ac..e186e4b62 100644
--- a/kate/data/sql-postgresql.xml
+++ b/kate/data/sql-postgresql.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- PostgreSQL SQL, syntax definition based on sql.xml by Yury Lebedev -->
-<language name="SQL (PostgreSQL)" version="1.13" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
+<language name="SQL (PostgreSQL)" version="2" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
   <highlighting>
     <list name="keywords">
       <item> ABORT </item>
@@ -733,7 +733,8 @@
     <contexts>
       <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
         <!-- HACK: don't jump into MultiLineString for CREATE FUNCTION $funcName$...$funcName$ -->
-        <StringDetect String="CREATE FUNCTION" context="CreateFunction" attribute="Keyword"/>
+        <RegExpr String="create\s+(or\s+replace\s+)?function" insensitive="true" context="CreateFunction" attribute="Keyword"/>
+        <RegExpr String="do\s+\$([^\$\n\r]*)\$" insensitive="true" context="FunctionBody" attribute="Keyword"/>
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Operator" context="#stay" String="operators"/>
         <keyword attribute="Function" context="#stay" String="functions"/>
diff --git a/kate/data/sql.xml b/kate/data/sql.xml
index 316eed422..466d83d62 100644
--- a/kate/data/sql.xml
+++ b/kate/data/sql.xml
@@ -3,7 +3,7 @@
 <!-- Oracle10g SQL and PL/SQL syntax - ANSI SQL 2003 superset -->
 <!-- This file is maintained by Anders Lund <anders@alweb.dk> since 2005-11-06 -->
 <!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
-<language name="SQL" version="1.17" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="LGPL">
+<language name="SQL" version="2" kateversion="2.4" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Yury Lebedev (yurylebedev@mail.ru)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> ACCESS </item>
diff --git a/kate/data/stata.xml b/kate/data/stata.xml
index f8320de50..07fd4ee36 100644
--- a/kate/data/stata.xml
+++ b/kate/data/stata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Stata" version="2.00" kateversion="2.3" section="Sources" extensions="*.do; *.ado; *.doh; *.DO; *.ADO; *.DOH"
+<language name="Stata" version="3" kateversion="2.3" section="Sources" extensions="*.do; *.ado; *.doh; *.DO; *.ADO; *.DOH"
  casesensitive="1" priority="5" author="Larry Radbill (Larry.Radbill gmail com)" license="LGPL" >
 
   <highlighting>
diff --git a/kate/data/systemc.xml b/kate/data/systemc.xml
index 382005bb2..0b98937cb 100644
--- a/kate/data/systemc.xml
+++ b/kate/data/systemc.xml
@@ -7,7 +7,7 @@
 ================================================================================
     July 17th 2008                            Initial version
 -->
-<language name="SystemC" version="0.01" kateversion="2.4" section="Hardware" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="1" author="Joseph Wenninger (jowenn@kde.org)" license="LGPL">
+<language name="SystemC" version="1" kateversion="2.4" section="Hardware" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="1" author="Joseph Wenninger (jowenn@kde.org)" license="LGPL">
 
 <highlighting>
 <list name="systemc_keywords">
diff --git a/kate/data/systemverilog.xml b/kate/data/systemverilog.xml
index a13d3fc19..26c84db0b 100644
--- a/kate/data/systemverilog.xml
+++ b/kate/data/systemverilog.xml
@@ -39,7 +39,7 @@
 <!--                                                                       -->
 <!--***********************************************************************-->
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="SystemVerilog" version="1.50" kateversion="2.4" section="Hardware" extensions="*.sv;*.svh" mimetype="text/x-systemverilog-src" author="Sean O'Boyle (seanoboyle@intelligentdv.com)" license="GPL">
+<language name="SystemVerilog" version="2" kateversion="2.4" section="Hardware" extensions="*.sv;*.svh" mimetype="text/x-systemverilog-src" author="Sean O'Boyle (seanoboyle@intelligentdv.com)" license="GPL">
   <highlighting>
     <list name="key_deprecated">
        <item> defparam </item>
diff --git a/kate/data/taskjuggler.xml b/kate/data/taskjuggler.xml
index c8c3f7a8d..eff87937c 100644
--- a/kate/data/taskjuggler.xml
+++ b/kate/data/taskjuggler.xml
@@ -11,7 +11,7 @@
 
     Licensed under the GPLv2.
 -->
-<language name="TaskJuggler" version="1.21" kateversion="2.1" section="Scripts" extensions="*.tjp;*.tji" license="GPLv2">
+<language name="TaskJuggler" version="2" kateversion="2.1" section="Scripts" extensions="*.tjp;*.tji" license="GPLv2">
 <highlighting>
     <list name="keywords">
         <item> account </item>
diff --git a/kate/data/tcl.xml b/kate/data/tcl.xml
index 88f84c88e..8d3590a94 100644
--- a/kate/data/tcl.xml
+++ b/kate/data/tcl.xml
@@ -28,7 +28,7 @@
 	    - Fixed detection of varaibles with names containing serval namespace delimiters (::)
 -->
 
-<language name="Tcl/Tk" version="1.11" kateversion="2.4" section="Scripts" extensions="*.tcl;*.tk" mimetype="text/x-tcl">
+<language name="Tcl/Tk" version="2" kateversion="2.4" section="Scripts" extensions="*.tcl;*.tk" mimetype="text/x-tcl">
   <highlighting>
     <list name="keywords">
       <item> after </item>
diff --git a/kate/data/tcsh.xml b/kate/data/tcsh.xml
index 1b3c20a6e..676b1ce2e 100644
--- a/kate/data/tcsh.xml
+++ b/kate/data/tcsh.xml
@@ -8,7 +8,7 @@
         <!ENTITY noword   "(?![\w$+-])">		<!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
 ]>
-<language name="Tcsh" version="0.2-1" kateversion="2.4" section="Scripts" extensions="*.csh;*.tcsh;csh.cshrc;csh.login;.tcshrc;.cshrc;.login" mimetype="application/x-csh" casesensitive="1" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="LGPL">
+<language name="Tcsh" version="1-1" kateversion="2.4" section="Scripts" extensions="*.csh;*.tcsh;csh.cshrc;csh.login;.tcshrc;.cshrc;.login" mimetype="application/x-csh" casesensitive="1" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="LGPL">
 
 <!-- (c) 2006 Matthew Woehlke (mw_triad@users.sourceforge.net)
     Based on the bash highlighter by Wilbert Berendsen (wilbert@kde.nl)
diff --git a/kate/data/template-toolkit.xml b/kate/data/template-toolkit.xml
index 2bc1735e6..0a2e8821c 100644
--- a/kate/data/template-toolkit.xml
+++ b/kate/data/template-toolkit.xml
@@ -16,7 +16,7 @@
     Changelog :)
     0.02 Added highliting for interpolated variables
         -->
-<language version="0.03-2" kateversion="2.3"
+<language version="1-1" kateversion="2.3"
           author="Красимир Беров (k.berov@gmail.com)" license="Artistic"
           name="TT2" section="Markup" extensions="*.tt*;" casesensitive="true">
 <highlighting>
diff --git a/kate/data/texinfo.xml b/kate/data/texinfo.xml
index 69e411870..a43394a4d 100644
--- a/kate/data/texinfo.xml
+++ b/kate/data/texinfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Texinfo" extensions="*.texi" section="Markup" mimetype="application/x-texinfo" author="Daniel Franke (franke.daniel@gmail.com)" license="LGPL" version="0.2" kateversion="2.4">
+<language name="Texinfo" extensions="*.texi" section="Markup" mimetype="application/x-texinfo" author="Daniel Franke (franke.daniel@gmail.com)" license="LGPL" version="1" kateversion="2.4">
 
   <highlighting>
     <!--
diff --git a/kate/data/tibasic.xml b/kate/data/tibasic.xml
index 86fbc7e07..caf5a6d31 100644
--- a/kate/data/tibasic.xml
+++ b/kate/data/tibasic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="TI Basic" version="1.01" kateversion="2.2" section="Scientific" extensions="">
+<language name="TI Basic" version="2" kateversion="2.2" section="Scientific" extensions="">
   <highlighting>
     <list name="keywords">
       <item>If </item>
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index fd819c72a..d0fc2465a 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -1,13 +1,13 @@
 <!DOCTYPE DEFINITIONS>
 <DEFINITIONS>
 <Definition name="4DOS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/4dos.xml" version="1.0"/>
-<Definition name="ABAP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/abap.xml" version="1.00"/>
-<Definition name="ABC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/abc.xml" version="1.10"/>
+<Definition name="ABAP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/abap.xml" version="2"/>
+<Definition name="ABC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/abc.xml" version="3"/>
 <Definition name="ActionScript 2.0" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/actionscript.xml" version="1.0"/>
 <Definition name="Ada" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ada.xml" version="1.08"/>
 <Definition name="AHDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ahdl.xml" version="1.04"/>
 <Definition name="AutoHotKey" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ahk.xml" version="1.0"/>
-<Definition name="Alerts_indent" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/alert_indent.xml" version="1.10-1"/>
+<Definition name="Alerts_indent" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/alert_indent.xml" version="2-1"/>
 <Definition name="Alerts" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/alert.xml" version="1.09-2"/>
 <Definition name="AMPLE" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ample.xml" version="0.3"/>
 <Definition name="ANSI C89" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ansic89.xml" version="1.10-1"/>
@@ -17,17 +17,18 @@
 <Definition name="AVR Assembler" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/asm-avr.xml" version="1.04-1"/>
 <Definition name="Motorola DSP56k" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/asm-dsp56k.xml" version="1.01"/>
 <Definition name="Motorola 68k (VASM/Devpac)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/asm-m68k.xml" version="1.02"/>
-<Definition name="ASN.1" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/asn1.xml" version="1.01-1"/>
+<Definition name="ASN.1" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/asn1.xml" version="2-1"/>
 <Definition name="ASP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/asp.xml" version="1.04"/>
-<Definition name="Asterisk" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/asterisk.xml" version="1.00"/>
+<Definition name="Asterisk" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/asterisk.xml" version="2"/>
 <Definition name="AWK" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/awk.xml" version="0.93"/>
 <Definition name="Bash" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bash.xml" version="2.17-1"/>
+<Definition name="Bitbake" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bitbake.xml" version="2"/>
 <Definition name="BibTeX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bibtex.xml" version="1.17"/>
 <Definition name="B-Method" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/bmethod.xml" version="0.2"/>
 <Definition name="CleanCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ccss.xml" version="1.1"/>
 <Definition name="CGiS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cgis.xml" version="1.02"/>
 <Definition name="Cg" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cg.xml" version="1.11"/>
-<Definition name="ChangeLog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/changelog.xml" version="1.04"/>
+<Definition name="ChangeLog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/changelog.xml" version="2"/>
 <Definition name="CartoCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/carto-css.xml" version="0.4"/>
 <Definition name="Chicken" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/chicken.xml" version="1.12-1"/>
 <Definition name="Cisco" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cisco.xml" version="1.10"/>
@@ -35,9 +36,9 @@
 <Definition name="Clojure" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/clojure.xml" version="3-1"/>
 <Definition name="CMake" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cmake.xml" version="1.34-1"/>
 <Definition name="CoffeeScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coffee.xml" version="1.4"/>
-<Definition name="ColdFusion" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coldfusion.xml" version="1.05"/>
+<Definition name="ColdFusion" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/coldfusion.xml" version="2"/>
 <Definition name="Common Lisp" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/commonlisp.xml" version="1.05-1"/>
-<Definition name="Component-Pascal" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/component-pascal.xml" version="1.05"/>
+<Definition name="Component-Pascal" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/component-pascal.xml" version="2"/>
 <Definition name="ConTeXt" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/context.xml" version="1.1"/>
 <Definition name="C++" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cpp.xml" version="1.0"/>
 <Definition name="Crack" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/crk.xml" version="1.1"/>
@@ -48,11 +49,11 @@
 <Definition name="Curry" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/curry.xml" version="0.3"/>
 <Definition name="C" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/c.xml" version="1.46"/>
 <Definition name="Ddoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ddoc.xml" version="1.15"/>
-<Definition name="Debian Changelog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debianchangelog.xml" version="0.71"/>
+<Definition name="Debian Changelog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debianchangelog.xml" version="1"/>
 <Definition name="Debian Control" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debiancontrol.xml" version="0.84"/>
-<Definition name=".desktop" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/desktop.xml" version="1.06-1"/>
+<Definition name=".desktop" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/desktop.xml" version="2-1"/>
 <Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.12"/>
-<Definition name="Django HTML Template" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/djangotemplate.xml" version="1.3"/>
+<Definition name="Django HTML Template" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/djangotemplate.xml" version="3"/>
 <Definition name="Dockerfile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dockerfile.xml" version="1.1"/>
 <Definition name="MS-DOS Batch" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dosbat.xml" version="0.30"/>
 <Definition name="dot" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dot.xml" version="1.1"/>
@@ -61,9 +62,9 @@
 <Definition name="DTD" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dtd.xml" version="1.02"/>
 <Definition name="D" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/d.xml" version="1.62-1"/>
 <Definition name="Eiffel" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/eiffel.xml" version="1.02"/>
-<Definition name="Email" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/email.xml" version="1.01"/>
+<Definition name="Email" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/email.xml" version="2"/>
 <Definition name="Erlang" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/erlang.xml" version="1.03"/>
-<Definition name="Euphoria" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/euphoria.xml" version="2.09-1"/>
+<Definition name="Euphoria" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/euphoria.xml" version="3-1"/>
 <Definition name="E Language" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/e.xml" version="0.22"/>
 <Definition name="Intel x86 (FASM)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/fasm.xml" version="0.2"/>
 <Definition name="ferite" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ferite.xml" version="1.04"/>
@@ -77,10 +78,10 @@
 <Definition name="GAP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gap.xml" version="0.2-1"/>
 <Definition name="GCCExtensions" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gcc.xml" version="0.4"/>
 <Definition name="GDB Backtrace" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gdb.xml" version="1.0-1"/>
-<Definition name="GDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gdl.xml" version="1.01"/>
+<Definition name="GDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gdl.xml" version="2"/>
 <Definition name="GNU Gettext" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gettext.xml" version="2.01-1"/>
-<Definition name="Git Ignore" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/git-ignore.xml" version="0.1"/>
-<Definition name="Git Rebase" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/git-rebase.xml" version="1.00"/>
+<Definition name="Git Ignore" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/git-ignore.xml" version="1"/>
+<Definition name="Git Rebase" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/git-rebase.xml" version="2"/>
 <Definition name="Gitolite" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gitolite.xml" version="0.1"/>
 <Definition name="GlossTex" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/glosstex.xml" version="0.01"/>
 <Definition name="GLSL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/glsl.xml" version="1.04"/>
@@ -89,165 +90,167 @@
 <Definition name="Go" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/go.xml" version="1.05-1"/>
 <Definition name="KDev-PG[-Qt] Grammar" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/grammar.xml" version="0.24-1"/>
 <Definition name="Groovy" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/groovy.xml" version="1.0"/>
-<Definition name="Hamlet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/hamlet.xml" version="0.1"/>
+<Definition name="Hamlet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/hamlet.xml" version="2"/>
 <Definition name="Haml" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haml.xml" version="1.1"/>
 <Definition name="Haskell" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haskell.xml" version="2.4"/>
-<Definition name="Haxe" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haxe.xml" version="0.1"/>
+<Definition name="Haxe" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/haxe.xml" version="1"/>
 <Definition name="PHP (HTML)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/html-php.xml" version="2.1"/>
 <Definition name="HTML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/html.xml" version="2.1"/>
 <Definition name="Hunspell Affix File" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/hunspell-aff.xml" version="1"/>
 <Definition name="Hunspell Thesaurus File" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/hunspell-dat.xml" version="1"/>
 <Definition name="Hunspell Dictionary File" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/hunspell-dic.xml" version="1"/>
 <Definition name="Hunspell Thesaurus Index File" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/hunspell-idx.xml" version="1"/>
-<Definition name="Quake Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/idconsole.xml" version="1.02"/>
-<Definition name="IDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/idl.xml" version="1.07"/>
-<Definition name="ILERPG" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ilerpg.xml" version="1.05-1"/>
-<Definition name="Inform" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/inform.xml" version="1.23-1"/>
-<Definition name="INI Files" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ini.xml" version="1.1-1"/>
+<Definition name="Quake Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/idconsole.xml" version="2"/>
+<Definition name="IDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/idl.xml" version="2"/>
+<Definition name="ILERPG" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ilerpg.xml" version="2-1"/>
+<Definition name="Inform" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/inform.xml" version="2"/>
+<Definition name="INI Files" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ini.xml" version="2-1"/>
 <Definition name="ISO C++" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/isocpp.xml" version="2.5-1"/>
-<Definition name="Jam" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jam.xml" version="0.4"/>
-<Definition name="Javadoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javadoc.xml" version="1.05"/>
+<Definition name="Jam" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jam.xml" version="1"/>
+<Definition name="Javadoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javadoc.xml" version="2"/>
 <Definition name="JavaScript/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript-php.xml" version="1.22"/>
 <Definition name="JavaScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javascript.xml" version="1.22"/>
 <Definition name="Java" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/java.xml" version="1.21"/>
-<Definition name="JSON" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/json.xml" version="1.3"/>
-<Definition name="JSP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jsp.xml" version="1.02"/>
-<Definition name="Julia" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/julia.xml" version="0.2-1"/>
+<Definition name="JSON" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/json.xml" version="2"/>
+<Definition name="JSP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jsp.xml" version="2"/>
+<Definition name="Julia" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/julia.xml" version="1-1"/>
 <Definition name="J" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/j.xml" version="1.1"/>
-<Definition name="KBasic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/kbasic.xml" version="1.02"/>
+<Definition name="KBasic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/kbasic.xml" version="2"/>
 <Definition name="LaTeX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/latex.xml" version="1.55"/>
-<Definition name="LDIF" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ldif.xml" version="1.02"/>
-<Definition name="GNU Linker Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ld.xml" version="1.0"/>
+<Definition name="LDIF" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ldif.xml" version="2"/>
+<Definition name="GNU Linker Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ld.xml" version="2"/>
 <Definition name="LessCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/less.xml" version="0.01"/>
-<Definition name="Lex/Flex" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/lex.xml" version="1.01-1"/>
+<Definition name="Lex/Flex" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/lex.xml" version="2-1"/>
 <Definition name="LilyPond" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/lilypond.xml" version="2.21"/>
 <Definition name="Literate Curry" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/literate-curry.xml" version="0.2"/>
 <Definition name="Literate Haskell" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/literate-haskell.xml" version="2.1"/>
-<Definition name="Logtalk" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/logtalk.xml" version="1.51"/>
-<Definition name="LPC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/lpc.xml" version="0.76"/>
-<Definition name="LSL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/lsl.xml" version="1.20"/>
+<Definition name="Logtalk" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/logtalk.xml" version="2"/>
+<Definition name="LPC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/lpc.xml" version="1"/>
+<Definition name="LSL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/lsl.xml" version="2"/>
 <Definition name="Lua" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/lua.xml" version="1.06"/>
-<Definition name="M3U" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/m3u.xml" version="1.10-1"/>
+<Definition name="M3U" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/m3u.xml" version="2"/>
 <Definition name="GNU M4" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/m4.xml" version="1.1-1"/>
-<Definition name="MAB-DB" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mab.xml" version="1.03"/>
+<Definition name="MAB-DB" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mab.xml" version="2"/>
+<Definition name="Magma" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/magma.xml" version="2"/>
 <Definition name="Makefile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/makefile.xml" version="2.1"/>
 <Definition name="Mako" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mako.xml" version="1.0"/>
-<Definition name="Troff Mandoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mandoc.xml" version="0.11"/>
-<Definition name="Mason" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mason.xml" version="1.06"/>
+<Definition name="Troff Mandoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mandoc.xml" version="1"/>
+<Definition name="Mason" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mason.xml" version="2"/>
 <Definition name="Mathematica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mathematica.xml" version="8.1"/>
-<Definition name="Matlab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/matlab.xml" version="1.31-1"/>
+<Definition name="Matlab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/matlab.xml" version="2-1"/>
 <Definition name="Maxima" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/maxima.xml" version="0.17-1"/>
 <Definition name="MediaWiki" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mediawiki.xml" version="1.10"/>
-<Definition name="MEL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mel.xml" version="1.01"/>
-<Definition name="mergetag text" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mergetagtext.xml" version="0.1"/>
-<Definition name="Meson" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/meson.xml" version="1.0"/>
-<Definition name="Metapost/Metafont" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/metafont.xml" version="0.9"/>
-<Definition name="MIPS Assembler" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mips.xml" version="1.03"/>
-<Definition name="Modelica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/modelica.xml" version="3.2-1"/>
+<Definition name="MEL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mel.xml" version="2"/>
+<Definition name="mergetag text" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mergetagtext.xml" version="1"/>
+<Definition name="Meson" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/meson.xml" version="2"/>
+<Definition name="Metapost/Metafont" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/metafont.xml" version="1"/>
+<Definition name="MIPS Assembler" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mips.xml" version="2"/>
+<Definition name="Modelica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/modelica.xml" version="4-1"/>
 <Definition name="Modelines" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/modelines.xml" version="1.2-1"/>
-<Definition name="Modula-2" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/modula-2.xml" version="1.03"/>
-<Definition name="MonoBasic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/monobasic.xml" version="1.01"/>
-<Definition name="Music Publisher" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mup.xml" version="1.07"/>
-<Definition name="Nagios" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/nagios.xml" version="1.0"/>
-<Definition name="Intel x86 (NASM)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/nasm.xml" version="1.40"/>
-<Definition name="Nemerle" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/nemerle.xml" version="0.32"/>
-<Definition name="nesC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/nesc.xml" version="1.00-1"/>
-<Definition name="noweb" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/noweb.xml" version="1.0"/>
+<Definition name="Modula-2" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/modula-2.xml" version="2"/>
+<Definition name="MonoBasic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/monobasic.xml" version="2"/>
+<Definition name="Music Publisher" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mup.xml" version="2"/>
+<Definition name="Nagios" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/nagios.xml" version="2"/>
+<Definition name="Intel x86 (NASM)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/nasm.xml" version="2"/>
+<Definition name="Nemerle" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/nemerle.xml" version="1"/>
+<Definition name="nesC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/nesc.xml" version="2"/>
+<Definition name="noweb" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/noweb.xml" version="2"/>
 <Definition name="Objective-C++" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/objectivecpp.xml" version="1.01-1"/>
 <Definition name="Objective-C" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/objectivec.xml" version="1.07-1"/>
-<Definition name="Objective Caml Ocamllex" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ocamllex.xml" version="2.02"/>
-<Definition name="Objective Caml" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ocaml.xml" version="2.01"/>
-<Definition name="Objective Caml Ocamlyacc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ocamlyacc.xml" version="2.02"/>
+<Definition name="Objective Caml Ocamllex" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ocamllex.xml" version="3"/>
+<Definition name="Objective Caml" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ocaml.xml" version="3"/>
+<Definition name="Objective Caml Ocamlyacc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ocamlyacc.xml" version="3"/>
 <Definition name="Octave" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/octave.xml" version="1.02-1"/>
 <Definition name="OORS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/oors.xml" version="2"/>
-<Definition name="OPAL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/opal.xml" version="1.1"/>
+<Definition name="OPAL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/opal.xml" version="2"/>
 <Definition name="OpenCL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/opencl.xml" version="1.44"/>
-<Definition name="Pango" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pango.xml" version="0.1"/>
+<Definition name="Pango" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pango.xml" version="2"/>
 <Definition name="Pascal" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pascal.xml" version="1.23"/>
-<Definition name="Perl" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/perl.xml" version="1.32-1"/>
-<Definition name="PGN" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pgn.xml" version="2.01-1"/>
+<Definition name="Perl" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/perl.xml" version="2-1"/>
+<Definition name="PGN" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pgn.xml" version="3-1"/>
 <Definition name="PHP/PHP" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/php.xml" version="1.44"/>
-<Definition name="PicAsm" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/picsrc.xml" version="1.07"/>
+<Definition name="PicAsm" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/picsrc.xml" version="2"/>
 <Definition name="Pig" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pig.xml" version="3.0"/>
-<Definition name="Pike" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pike.xml" version="1.07"/>
-<Definition name="PostScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/postscript.xml" version="1.01"/>
-<Definition name="POV-Ray" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/povray.xml" version="1.2.1"/>
-<Definition name="PostScript Printer Description" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ppd.xml" version="0.2"/>
-<Definition name="progress" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/progress.xml" version="1.10"/>
+<Definition name="Pike" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pike.xml" version="2"/>
+<Definition name="PostScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/postscript.xml" version="2"/>
+<Definition name="POV-Ray" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/povray.xml" version="3-1"/>
+<Definition name="PostScript Printer Description" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ppd.xml" version="1"/>
+<Definition name="Praat" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/praat.xml" version="1-1"/>
+<Definition name="progress" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/progress.xml" version="2"/>
 <Definition name="Prolog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/prolog.xml" version="1.3-1"/>
 <Definition name="Protobuf" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/protobuf.xml" version="2.40"/>
 <Definition name="Puppet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/puppet.xml" version="1.18"/>
-<Definition name="PureBasic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/purebasic.xml" version="5.31"/>
+<Definition name="PureBasic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/purebasic.xml" version="6"/>
 <Definition name="Python" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/python.xml" version="2.23"/>
 <Definition name="QMake" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/qmake.xml" version="1.2"/>
 <Definition name="QML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/qml.xml" version="1.4"/>
-<Definition name="q" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/q.xml" version="1.01"/>
+<Definition name="q" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/q.xml" version="2"/>
 <Definition name="C++/Qt4" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/qt4.xml" version="1.9-1"/>
-<Definition name="RapidQ" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rapidq.xml" version="1.01"/>
-<Definition name="RelaxNG-Compact" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/relaxngcompact.xml" version="0.2"/>
-<Definition name="RELAX NG" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/relaxng.xml" version="0.8"/>
-<Definition name="Replicode" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/replicode.xml" version="1.00"/>
+<Definition name="RapidQ" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rapidq.xml" version="2"/>
+<Definition name="RelaxNG-Compact" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/relaxngcompact.xml" version="1"/>
+<Definition name="RELAX NG" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/relaxng.xml" version="1"/>
+<Definition name="Replicode" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/replicode.xml" version="2"/>
 <Definition name="Restructured Text" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/restructuredtext.xml" version="1.0"/>
-<Definition name="reStructuredText" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rest.xml" version="1.5"/>
-<Definition name="REXX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rexx.xml" version="1.01"/>
-<Definition name="Ruby/Rails/RHTML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rhtml.xml" version="1.01"/>
-<Definition name="RenderMan RIB" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rib.xml" version="1.00"/>
-<Definition name="Roff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/roff.xml" version="1.0"/>
-<Definition name="RPM Spec" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rpmspec.xml" version="2.04"/>
-<Definition name="RSI IDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rsiidl.xml" version="1.04"/>
-<Definition name="Rich Text Format" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rtf.xml" version="1.0"/>
+<Definition name="reStructuredText" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rest.xml" version="2"/>
+<Definition name="REXX" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rexx.xml" version="2"/>
+<Definition name="Ruby/Rails/RHTML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rhtml.xml" version="3"/>
+<Definition name="RenderMan RIB" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rib.xml" version="2"/>
+<Definition name="Roff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/roff.xml" version="2"/>
+<Definition name="RPM Spec" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rpmspec.xml" version="3"/>
+<Definition name="RSI IDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rsiidl.xml" version="2"/>
+<Definition name="Rich Text Format" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rtf.xml" version="2"/>
 <Definition name="Ruby" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ruby.xml" version="1.27"/>
 <Definition name="Rust" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rust.xml" version="1.0"/>
-<Definition name="R Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/r.xml" version="2.08-1"/>
-<Definition name="Sather" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sather.xml" version="1.03"/>
-<Definition name="Scala" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scala.xml" version="1.0"/>
-<Definition name="Scheme" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scheme.xml" version="1.13-1"/>
-<Definition name="scilab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sci.xml" version="1.03"/>
+<Definition name="R Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/r.xml" version="3-1"/>
+<Definition name="Sather" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sather.xml" version="2"/>
+<Definition name="Scala" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scala.xml" version="2"/>
+<Definition name="Scheme" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scheme.xml" version="2-1"/>
+<Definition name="scilab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sci.xml" version="2"/>
 <Definition name="SCSS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/scss.xml" version="2.05"/>
-<Definition name="sed" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sed.xml" version="1.0"/>
-<Definition name="SGML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sgml.xml" version="1.02"/>
-<Definition name="Sieve" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sieve.xml" version="1.05"/>
-<Definition name="SiSU" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sisu.xml" version="1.02"/>
-<Definition name="SML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sml.xml" version="1.06"/>
-<Definition name="Spice" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/spice.xml" version="1.01"/>
+<Definition name="sed" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sed.xml" version="2"/>
+<Definition name="SGML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sgml.xml" version="2"/>
+<Definition name="Sieve" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sieve.xml" version="2"/>
+<Definition name="SiSU" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sisu.xml" version="2"/>
+<Definition name="SML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sml.xml" version="2"/>
+<Definition name="Spice" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/spice.xml" version="2"/>
 <Definition name="SQL (MySQL)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql-mysql.xml" version="1.16"/>
-<Definition name="SQL (Oracle)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql-oracle.xml" version="1.0"/>
-<Definition name="SQL (PostgreSQL)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql-postgresql.xml" version="1.13"/>
-<Definition name="SQL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql.xml" version="1.17"/>
-<Definition name="Stata" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/stata.xml" version="2.00"/>
-<Definition name="SystemC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/systemc.xml" version="0.01"/>
-<Definition name="SystemVerilog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/systemverilog.xml" version="1.50"/>
+<Definition name="SQL (Oracle)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql-oracle.xml" version="2"/>
+<Definition name="SQL (PostgreSQL)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql-postgresql.xml" version="2"/>
+<Definition name="SQL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql.xml" version="2"/>
+<Definition name="Stata" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/stata.xml" version="3"/>
+<Definition name="SystemC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/systemc.xml" version="1"/>
+<Definition name="SystemVerilog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/systemverilog.xml" version="2"/>
 <Definition name="TADS 3" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tads3.xml" version="1.0"/>
-<Definition name="TaskJuggler" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/taskjuggler.xml" version="1.21"/>
-<Definition name="Tcl/Tk" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tcl.xml" version="1.11"/>
-<Definition name="Tcsh" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tcsh.xml" version="0.2-1"/>
-<Definition name="TT2" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/template-toolkit.xml" version="0.03-2"/>
-<Definition name="Texinfo" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/texinfo.xml" version="0.2"/>
+<Definition name="TaskJuggler" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/taskjuggler.xml" version="2"/>
+<Definition name="Tcl/Tk" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tcl.xml" version="2"/>
+<Definition name="Tcsh" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tcsh.xml" version="1-1"/>
+<Definition name="TT2" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/template-toolkit.xml" version="1-1"/>
+<Definition name="Texinfo" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/texinfo.xml" version="1"/>
 <Definition name="Textile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/textile.xml" version="1.1"/>
-<Definition name="TI Basic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tibasic.xml" version="1.01"/>
+<Definition name="TI Basic" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/tibasic.xml" version="2"/>
 <Definition name="txt2tags" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/txt2tags.xml" version="1.20"/>
-<Definition name="UnrealScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/uscript.xml" version="0.92"/>
-<Definition name="Valgrind Suppression" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/valgrind-suppression.xml" version="1.0"/>
+<Definition name="UnrealScript" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/uscript.xml" version="1"/>
+<Definition name="Valgrind Suppression" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/valgrind-suppression.xml" version="2"/>
 <Definition name="Varnish Test Case language" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/varnishtest.xml" version="0.1"/>
 <Definition name="Varnish Configuration Language" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/varnish.xml" version="0.3"/>
-<Definition name="vCard, vCalendar, iCalendar" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/vcard.xml" version="0.1"/>
-<Definition name="Velocity" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/velocity.xml" version="1.04"/>
-<Definition name="Vera" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/vera.xml" version="1.01"/>
-<Definition name="Verilog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/verilog.xml" version="1.09"/>
+<Definition name="vCard, vCalendar, iCalendar" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/vcard.xml" version="1"/>
+<Definition name="Velocity" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/velocity.xml" version="2"/>
+<Definition name="Vera" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/vera.xml" version="2"/>
+<Definition name="Verilog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/verilog.xml" version="2"/>
 <Definition name="VHDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/vhdl.xml" version="1.10"/>
-<Definition name="VRML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/vrml.xml" version="1.02"/>
-<Definition name="WINE Config" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/winehq.xml" version="1.03"/>
-<Definition name="Wesnoth Markup Language" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/wml.xml" version="0.42"/>
-<Definition name="xHarbour" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xharbour.xml" version="1.04"/>
-<Definition name="XML (Debug)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xmldebug.xml" version="1.03"/>
+<Definition name="VRML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/vrml.xml" version="3"/>
+<Definition name="WINE Config" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/winehq.xml" version="3"/>
+<Definition name="Wesnoth Markup Language" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/wml.xml" version="1"/>
+<Definition name="xHarbour" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xharbour.xml" version="2"/>
+<Definition name="XML (Debug)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xmldebug.xml" version="2"/>
 <Definition name="XML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xml.xml" version="2.03-1"/>
-<Definition name="Xonotic Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xonotic-console.xml" version="0.1"/>
-<Definition name="x.org Configuration" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xorg.xml" version="1.01"/>
-<Definition name="xslt" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xslt.xml" version="1.03"/>
-<Definition name="XUL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xul.xml" version="0.11"/>
-<Definition name="yacas" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/yacas.xml" version="1.02"/>
-<Definition name="Yacc/Bison" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/yacc.xml" version="1.04-1"/>
-<Definition name="YAML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/yaml.xml" version="1.2"/>
-<Definition name="Zonnon" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/zonnon.xml" version="1.0"/>
-<Definition name="Zsh" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/zsh.xml" version="0.1-1"/>
+<Definition name="Xonotic Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xonotic-console.xml" version="1"/>
+<Definition name="x.org Configuration" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xorg.xml" version="2"/>
+<Definition name="xslt" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xslt.xml" version="2"/>
+<Definition name="XUL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/xul.xml" version="2"/>
+<Definition name="yacas" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/yacas.xml" version="2"/>
+<Definition name="Yacc/Bison" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/yacc.xml" version="3-1"/>
+<Definition name="YAML" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/yaml.xml" version="2"/>
+<Definition name="Zonnon" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/zonnon.xml" version="2"/>
+<Definition name="Zsh" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/zsh.xml" version="1-1"/>
 </DEFINITIONS>
diff --git a/kate/data/uscript.xml b/kate/data/uscript.xml
index e905a77f1..57e061b8e 100644
--- a/kate/data/uscript.xml
+++ b/kate/data/uscript.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="UnrealScript" version="0.92" kateversion="2.2" section="Scripts" extensions="*.uc" mimetype="text/x-uscript">
+<language name="UnrealScript" version="1" kateversion="2.2" section="Scripts" extensions="*.uc" mimetype="text/x-uscript">
 	<highlighting>
 		<list name="keywords">
 			<item> break </item>
diff --git a/kate/data/valgrind-suppression.xml b/kate/data/valgrind-suppression.xml
index 6ba52085c..7fe3dd474 100644
--- a/kate/data/valgrind-suppression.xml
+++ b/kate/data/valgrind-suppression.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="1.0" kateversion="2.4" author="Milian Wolff (mail@milianw.de)" license="LGPL">
+<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="2" kateversion="2.4" author="Milian Wolff (mail@milianw.de)" license="LGPL">
 <highlighting>
 <contexts>
   <context name="File" attribute="Normal Text" lineEndContext="#stay">
diff --git a/kate/data/vcard.xml b/kate/data/vcard.xml
index 3eeed3c0b..2e2c8e745 100644
--- a/kate/data/vcard.xml
+++ b/kate/data/vcard.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE language SYSTEM "language.dtd" []>
 
-<language name="vCard, vCalendar, iCalendar" version="0.1" kateversion="2.4" section="Markup" extensions="*.iCal;*.iCalendar;.ics;*.ifb;*.iFBf;*.vcal;*.vcalendar;*.vcard;*.vcf;" author="Lukas Sommer" mimetype="text/calendar;text/vcard" license="public domain">
+<language name="vCard, vCalendar, iCalendar" version="1" kateversion="2.4" section="Markup" extensions="*.iCal;*.iCalendar;.ics;*.ifb;*.iFBf;*.vcal;*.vcalendar;*.vcard;*.vcf;" author="Lukas Sommer" mimetype="text/calendar;text/vcard" license="public domain">
 
     <highlighting>
 
diff --git a/kate/data/velocity.xml b/kate/data/velocity.xml
index 3bf4affe6..8517772be 100644
--- a/kate/data/velocity.xml
+++ b/kate/data/velocity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Velocity" version="1.04" kateversion="2.3" section="Scripts" extensions="*.vm;" mimetype="text/x-velocity-src;text/x-vm-src" author="John Christopher (John@animalsinneed.net)" license="">
+<language name="Velocity" version="2" kateversion="2.3" section="Scripts" extensions="*.vm;" mimetype="text/x-velocity-src;text/x-vm-src" author="John Christopher (John@animalsinneed.net)" license="">
 	<highlighting>
 		<list name="keywords">
 			<item> #set </item>
diff --git a/kate/data/vera.xml b/kate/data/vera.xml
index 455f977c6..ad16e94a1 100644
--- a/kate/data/vera.xml
+++ b/kate/data/vera.xml
@@ -39,7 +39,7 @@
 <!--                                                                       -->
 <!--***********************************************************************-->
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Vera" version="1.01" kateversion="2.4" section="Hardware" extensions="*.vr;*.vri;*.vrh" mimetype="text/x-vera-src" author="Sean O'Boyle (seanoboyle@intelligentdv.com)" license="GPL">
+<language name="Vera" version="2" kateversion="2.4" section="Hardware" extensions="*.vr;*.vri;*.vrh" mimetype="text/x-vera-src" author="Sean O'Boyle (seanoboyle@intelligentdv.com)" license="GPL">
   <highlighting>
     <list name="keywords">
        <item>after</item>
diff --git a/kate/data/verilog.xml b/kate/data/verilog.xml
index 12619f2e8..36a778cfc 100644
--- a/kate/data/verilog.xml
+++ b/kate/data/verilog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Verilog" version="1.09" kateversion="2.4" section="Hardware" extensions="*.v;*.V;*.vl" mimetype="text/x-verilog-src" author="Yevgen Voronenko (ysv22@drexel.edu), Ryan Dalzell (ryan@tullyroan.com)" license="">
+<language name="Verilog" version="2" kateversion="2.4" section="Hardware" extensions="*.v;*.V;*.vl" mimetype="text/x-verilog-src" author="Yevgen Voronenko (ysv22@drexel.edu), Ryan Dalzell (ryan@tullyroan.com)" license="">
   <highlighting>
     <list name="keywords">
       <item> macromodule </item>
diff --git a/kate/data/vrml.xml b/kate/data/vrml.xml
index 6529d5e50..8387e8706 100644
--- a/kate/data/vrml.xml
+++ b/kate/data/vrml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="VRML" version="1.02" kateversion="2.3" section="Markup" extensions="*.wrl" mimetype="model/vrml" author="Volker Krause (vkrause@kde.org)" license="LGPL">
+<language name="VRML" version="3" kateversion="2.3" section="3D" extensions="*.wrl" mimetype="model/vrml" author="Volker Krause (vkrause@kde.org)" license="LGPL">
 	<highlighting>
 		<list name="keywords">
 			<item>DEF</item>
diff --git a/kate/data/winehq.xml b/kate/data/winehq.xml
index 07919a86a..79e65cffb 100644
--- a/kate/data/winehq.xml
+++ b/kate/data/winehq.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="WINE Config" version="1.03" kateversion="2.4" section="Configuration" extensions="*.reg" mimetype="">
+<language name="WINE Config" version="3" kateversion="2.4" section="Configuration" extensions="*.reg" mimetype="">
   <highlighting>
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
         <RegExpr String="WINE REGISTRY Version.*$" attribute="RegistryBeginEnd" context="#stay" />
         <RegExpr String="#\s*&lt;\s*wineconf\s*&gt;" attribute="RegistryBeginEnd" context="#stay" column="0"/>
         <RegExpr String="#\s*&lt;\s*\/\s*wineconf\s*&gt;" attribute="RegistryBeginEnd" context="#stay" column="0"/>
-        <RegExpr String="\[.*\]$" attribute="Section" context="#stay" column="0"/>
+        <RegExpr String="\[.*\]" attribute="Section" context="#stay" column="0"/>
         <RegExpr String=";.*$" attribute="Comment" context="#stay"/>
 
         <RegExpr String="\s*&quot;\s*[a-zA-Z0-9_.:*]*\s*&quot;" attribute="Key" context="#stay" />
diff --git a/kate/data/wml.xml b/kate/data/wml.xml
index 2aaeba5da..e3ce172f2 100644
--- a/kate/data/wml.xml
+++ b/kate/data/wml.xml
@@ -54,7 +54,7 @@
     * Made the new #ifndef directive be recognized (implemented on Wesnoth 1.3.11 and later)
 -->
 
-<language name="Wesnoth Markup Language" section="Markup" extensions="*.cfg;*.pbl;*.CFG;*.PBL" version="0.42"
+<language name="Wesnoth Markup Language" section="Markup" extensions="*.cfg;*.pbl;*.CFG;*.PBL" version="1"
           kateversion="2.3" casesensitive="true" author="Zachary Palmer (zep01@bahj.com), modif. by Ignacio Riquelme Morelle (shadowm2006@gmail.com) and Jonathan Schmidt-Dominé (devel@the-user.org)" license="GPL">
     <highlighting>
         <list name="alerts_wml_utils">
diff --git a/kate/data/xharbour.xml b/kate/data/xharbour.xml
index 4646249ca..05eedbe89 100644
--- a/kate/data/xharbour.xml
+++ b/kate/data/xharbour.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="xHarbour" version="1.04" kateversion="2.4" section="Sources" extensions="*.prg;*.PRG;*.ch" mimetype="text/x-xharbour-src" priority="5" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
+<language name="xHarbour" version="2" kateversion="2.4" section="Sources" extensions="*.prg;*.PRG;*.ch" mimetype="text/x-xharbour-src" priority="5" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
 <highlighting>
 
    <list name="keywords">
diff --git a/kate/data/xmldebug.xml b/kate/data/xmldebug.xml
index 9c019929c..f94fa9ef2 100644
--- a/kate/data/xmldebug.xml
+++ b/kate/data/xmldebug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language version="1.03" kateversion="2.4" name="XML (Debug)" section="Markup" extensions="" mimetype="">
+<language version="2" kateversion="2.4" name="XML (Debug)" section="Markup" extensions="" mimetype="">
   <highlighting>
     <list name="AttType">
         <item>CDATA</item>
diff --git a/kate/data/xonotic-console.xml b/kate/data/xonotic-console.xml
index 3c36a6ebf..1182254a4 100644
--- a/kate/data/xonotic-console.xml
+++ b/kate/data/xonotic-console.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Xonotic Script" version="0.1" kateversion="2.1" section="Scripts" extensions="*.cfg" mimetype="" license="LGPLv2+">
+<language name="Xonotic Script" version="1" kateversion="2.1" section="Scripts" extensions="*.cfg" mimetype="" license="LGPLv2+">
 
 <highlighting>
   <list name="Commands">
diff --git a/kate/data/xorg.xml b/kate/data/xorg.xml
index 7e7ae97c4..8ea88556b 100644
--- a/kate/data/xorg.xml
+++ b/kate/data/xorg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="x.org Configuration" section="Configuration" extensions="xorg.conf" mimetype="" version="1.01" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<language name="x.org Configuration" section="Configuration" extensions="xorg.conf" mimetype="" version="2" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
 
 <highlighting>
 <contexts>
diff --git a/kate/data/xslt.xml b/kate/data/xslt.xml
index 8075ef831..a731a59ba 100644
--- a/kate/data/xslt.xml
+++ b/kate/data/xslt.xml
@@ -52,7 +52,7 @@
 
 -->
 
-<language version="1.03" kateversion="2.4" name="xslt" section="Markup" extensions="*.xsl;*.xslt" license="LGPL" author="Peter Lammich (views@gmx.de)">
+<language version="2" kateversion="2.4" name="xslt" section="Markup" extensions="*.xsl;*.xslt" license="LGPL" author="Peter Lammich (views@gmx.de)">
   <highlighting>
     <list name="keytags">
       <item> xsl:value-of </item>
diff --git a/kate/data/xul.xml b/kate/data/xul.xml
index cc60c66ff..0b8362ee9 100644
--- a/kate/data/xul.xml
+++ b/kate/data/xul.xml
@@ -4,7 +4,7 @@
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-        <language name="XUL" version="0.11" kateversion="2.4" section="Markup" extensions="*.xul;*.xbl" mimetype="text/xul" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl), Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net), Marc Dassonneville (marc.dassonneville@gmail.com)" license="LGPL">
+        <language name="XUL" version="2" kateversion="2.4" section="Markup" extensions="*.xul;*.xbl" mimetype="text/xul" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl), Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net), Marc Dassonneville (marc.dassonneville@gmail.com)" license="LGPL">
 
 <highlighting>
    <list name="keywords">
@@ -590,7 +590,7 @@
   <itemData name="Doctype" defStyleNum="dsDataType" bold="1" />
   <itemData name="Element" defStyleNum="dsKeyword" />
   <itemData name="Attribute" defStyleNum="dsOthers" />
-  <itemData name="Value" defStyleNum="dsString" color="#a00" />
+  <itemData name="Value" defStyleNum="dsString" />
   <itemData name="EntityRef" defStyleNum="dsDecVal" />
   <itemData name="PEntityRef" defStyleNum="dsDecVal" />
   <itemData name="Error" defStyleNum="dsError" />
diff --git a/kate/data/yacas.xml b/kate/data/yacas.xml
index ac058602a..3e1159fd7 100644
--- a/kate/data/yacas.xml
+++ b/kate/data/yacas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="yacas" version="1.02" kateversion="2.2" section="Scientific" extensions="*.ys" mimetype="text/x-yacassrc">
+<language name="yacas" version="2" kateversion="2.2" section="Scientific" extensions="*.ys" mimetype="text/x-yacassrc">
   <highlighting>
     <list name="keywords">
       <item> And </item>
diff --git a/kate/data/yacc.xml b/kate/data/yacc.xml
index 41b83d141..214cb34cc 100644
--- a/kate/data/yacc.xml
+++ b/kate/data/yacc.xml
@@ -25,7 +25,7 @@ This code is released under the LGPL as part of tdelibs/kate.
 
 ========================================================================
 -->
-<language name="Yacc/Bison" version="1.04-1" kateversion="2.4" section="Sources" extensions="*.y;*.yy" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
+<language name="Yacc/Bison" version="3-1" kateversion="2.4" section="Sources" extensions="*.y;*.yy" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
 
 <highlighting>
 <contexts>
@@ -92,7 +92,7 @@ This code is released under the LGPL as part of tdelibs/kate.
     <IncludeRules context="Comment" />
     <RegExpr attribute="Normal Text" context="Percent Command In" String="\W" lookAhead="true" />
   </context>
-  <context name="Percent Command In" attribute="NormalText" lineEndContext="#pop#pop">
+  <context name="Percent Command In" attribute="Normal Text" lineEndContext="#pop#pop">
     <IncludeRules context="StringOrChar" />
     <DetectChar attribute="Data Type" context="PC type" char="&lt;" />
   </context>
@@ -112,7 +112,7 @@ This code is released under the LGPL as part of tdelibs/kate.
     <RegExpr attribute="Comment" context="#pop" String="[^\\]$" />
   </context>
 
-  <context name="StringOrChar" attribute="NormalText" lineEndContext="#stay">
+  <context name="StringOrChar" attribute="Normal Text" lineEndContext="#stay">
     <DetectChar attribute="String Char" context="Char" char="'" />
     <DetectChar attribute="String" context="String" char="&quot;" />
   </context>
diff --git a/kate/data/yaml.xml b/kate/data/yaml.xml
index 2f0bd4c8e..3024e6523 100644
--- a/kate/data/yaml.xml
+++ b/kate/data/yaml.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Author: Dr Orlovsky MA <maxim@orlovsky.info> //-->
-<language name="YAML" version="1.2" kateversion="2.5" section="Markup"
+<language name="YAML" version="2" kateversion="2.5" section="Markup"
           extensions="*.yaml;*.yml" mimetype="text/yaml"
           author="Dr Orlovsky MA (dr.orlovsky@gmail.com)" license="LGPL">
   <highlighting>
diff --git a/kate/data/zonnon.xml b/kate/data/zonnon.xml
index 35c829936..cf3a412b4 100644
--- a/kate/data/zonnon.xml
+++ b/kate/data/zonnon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Zonnon" version="1.0" kateversion="2.2" section="Sources" extensions="*.znn" mimetype="text/x-zonnon">
+<language name="Zonnon" version="2" kateversion="2.2" section="Sources" extensions="*.znn" mimetype="text/x-zonnon">
   <highlighting>
     <list name="keywords">
       <item> accept </item>
diff --git a/kate/data/zsh.xml b/kate/data/zsh.xml
index 473005bf3..cd107842d 100644
--- a/kate/data/zsh.xml
+++ b/kate/data/zsh.xml
@@ -8,7 +8,7 @@
         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
 ]>
-<language name="Zsh" version="0.1-1" kateversion="2.4" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript;text/x-shellscript" casesensitive="1" author="Jonathan Kolberg (bulldog98@kubuntu-de.org)" license="LGPL">
+<language name="Zsh" version="1-1" kateversion="2.4" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript;text/x-shellscript" casesensitive="1" author="Jonathan Kolberg (bulldog98@kubuntu-de.org)" license="LGPL">
 
 <!-- (c) 2011 by Jonathan Kolberg (bulldog98@kubuntu-de.org)
   modified for zsh -->