From 87fd132d0145d36d9eae9cdf521935202db228f7 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Fri, 19 Sep 2014 14:44:45 +0900
Subject: [PATCH] Kate syntax highlighting files update - Sep 2014

---
 kate/data/4dos.xml                 |  926 ++++++++++++++++++++++++
 kate/data/CMakeLists.txt           |   37 +-
 kate/data/Makefile.am              |   39 +-
 kate/data/abap.xml                 |    2 +-
 kate/data/actionscript.xml         |   18 +-
 kate/data/ahk.xml                  |   16 +-
 kate/data/alert_indent.xml         |    5 +-
 kate/data/ample.xml                |   38 +-
 kate/data/ansic89.xml              |   16 +-
 kate/data/ansys.xml                |    2 +-
 kate/data/apache.xml               |    2 +-
 kate/data/asm6502.xml              |  120 ++--
 kate/data/asp.xml                  |   58 +-
 kate/data/asterisk.xml             |    2 +-
 kate/data/awk.xml                  |    6 +-
 kate/data/c.xml                    |   33 +-
 kate/data/cisco.xml                |   16 +-
 kate/data/clipper.xml              |   32 +-
 kate/data/coldfusion.xml           |    2 +-
 kate/data/component-pascal.xml     |    2 +-
 kate/data/crk.xml                  |   18 +-
 kate/data/cs.xml                   |   18 +-
 kate/data/css-php.xml              |    2 +-
 kate/data/cue.xml                  |    2 +-
 kate/data/diff.xml                 |    4 +-
 kate/data/djangotemplate.xml       |   24 +-
 kate/data/dockerfile.xml           |   61 ++
 kate/data/dot.xml                  |    2 +-
 kate/data/doxygen.xml              |    8 +-
 kate/data/e.xml                    |    2 +-
 kate/data/eiffel.xml               |    2 +-
 kate/data/email.xml                |   24 +-
 kate/data/erlang.xml               |    2 +-
 kate/data/fasm.xml                 |  899 ++++++++++++++++++++++++
 kate/data/ferite.xml               |   18 +-
 kate/data/fgl-4gl.xml              |   20 +-
 kate/data/fgl-per.xml              |   20 +-
 kate/data/fortran.xml              |   66 +-
 kate/data/freebasic.xml            |    9 +-
 kate/data/fsharp.xml               |    2 +-
 kate/data/ftl.xml                  |   91 +++
 kate/data/gdl.xml                  |    2 +-
 kate/data/gettext.xml              |   10 +-
 kate/data/git-ignore.xml           |   40 ++
 kate/data/gitolite.xml             |   44 ++
 kate/data/glosstex.xml             |    2 +-
 kate/data/gnuplot.xml              |    2 +-
 kate/data/haskell.xml              |    8 +-
 kate/data/haxe.xml                 |  181 +++++
 kate/data/html-php.xml             |   78 +--
 kate/data/html.xml                 |   74 +-
 kate/data/hunspell-aff.xml         |  236 +++++++
 kate/data/hunspell-dat.xml         |   48 ++
 kate/data/hunspell-dic.xml         |   85 +++
 kate/data/hunspell-idx.xml         |   40 ++
 kate/data/idconsole.xml            |    4 +-
 kate/data/idl.xml                  |    2 +-
 kate/data/ilerpg.xml               |   18 +-
 kate/data/inform.xml               |    6 +-
 kate/data/ini.xml                  |    2 +-
 kate/data/isocpp.xml               |   17 +-
 kate/data/j.xml                    |   69 ++
 kate/data/jam.xml                  |    6 +-
 kate/data/java.xml                 |    2 +-
 kate/data/javadoc.xml              |    6 +-
 kate/data/javascript-php.xml       |    2 +-
 kate/data/json.xml                 |    2 +-
 kate/data/julia.xml                |    2 +-
 kate/data/kbasic.xml               |    2 +-
 kate/data/ld.xml                   |   83 +++
 kate/data/literate-haskell.xml     |    2 +-
 kate/data/lsl.xml                  | 1050 ++++++++++++++++++++++++++++
 kate/data/m3u.xml                  |    2 +-
 kate/data/mako.xml                 |   36 +-
 kate/data/mandoc.xml               |   89 +++
 kate/data/mason.xml                |   52 +-
 kate/data/mathematica.xml          |    2 +-
 kate/data/maxima.xml               |   10 +-
 kate/data/mergetagtext.xml         |    2 +-
 kate/data/metafont.xml             | 1009 ++++++++++++++++++++++++++
 kate/data/modelica.xml             |    2 +-
 kate/data/modula-2.xml             |    2 +-
 kate/data/nagios.xml               |   84 +++
 kate/data/nasm.xml                 |    4 +-
 kate/data/nemerle.xml              |    2 +-
 kate/data/nesc.xml                 |   20 +-
 kate/data/objectivec.xml           |   18 +-
 kate/data/objectivecpp.xml         |   16 +-
 kate/data/oors.xml                 |   20 +-
 kate/data/opal.xml                 |    2 +-
 kate/data/opencl.xml               |   16 +-
 kate/data/perl.xml                 |    6 +-
 kate/data/pgn.xml                  |    2 +-
 kate/data/picsrc.xml               |   10 +-
 kate/data/postscript.xml           |    2 +-
 kate/data/progress.xml             |   76 +-
 kate/data/prolog.xml               |    6 +-
 kate/data/protobuf.xml             |    2 +-
 kate/data/python.xml               |   10 +-
 kate/data/q.xml                    |  210 ++++++
 kate/data/r.xml                    |    2 +-
 kate/data/rapidq.xml               |    2 +-
 kate/data/relaxng.xml              |    2 +-
 kate/data/replicode.xml            |  200 ++++++
 kate/data/rexx.xml                 |    2 +-
 kate/data/rhtml.xml                |   24 +-
 kate/data/roff.xml                 |  197 ++++++
 kate/data/rsiidl.xml               |    2 +-
 kate/data/rtf.xml                  |   49 ++
 kate/data/sather.xml               |    2 +-
 kate/data/scala.xml                |   18 +-
 kate/data/sci.xml                  |    2 +-
 kate/data/sgml.xml                 |    2 +-
 kate/data/sml.xml                  |    2 +-
 kate/data/sql-mysql.xml            |  277 ++++----
 kate/data/sql-postgresql.xml       |   92 +--
 kate/data/sql.xml                  |   52 +-
 kate/data/stata.xml                |    2 +-
 kate/data/template-toolkit.xml     |   22 +-
 kate/data/texinfo.xml              |    2 +-
 kate/data/tibasic.xml              |    2 +-
 kate/data/update-files.xml         |   71 +-
 kate/data/uscript.xml              |   20 +-
 kate/data/valgrind-suppression.xml |    2 +-
 kate/data/velocity.xml             |    2 +-
 kate/data/vera.xml                 |    2 +-
 kate/data/vrml.xml                 |    2 +-
 kate/data/wml.xml                  |    2 +-
 kate/data/xharbour.xml             |   18 +-
 kate/data/xmldebug.xml             |    2 +-
 kate/data/xorg.xml                 |    2 +-
 kate/data/xslt.xml                 |    2 +-
 kate/data/xul.xml                  |    2 +-
 kate/data/yacas.xml                |    2 +-
 kate/data/yacc.xml                 |   10 +-
 kate/data/yaml.xml                 |    2 +-
 kate/data/zonnon.xml               |    2 +-
 137 files changed, 6668 insertions(+), 933 deletions(-)
 create mode 100644 kate/data/4dos.xml
 create mode 100644 kate/data/dockerfile.xml
 create mode 100644 kate/data/fasm.xml
 create mode 100644 kate/data/ftl.xml
 create mode 100644 kate/data/git-ignore.xml
 create mode 100644 kate/data/gitolite.xml
 create mode 100644 kate/data/haxe.xml
 create mode 100644 kate/data/hunspell-aff.xml
 create mode 100644 kate/data/hunspell-dat.xml
 create mode 100644 kate/data/hunspell-dic.xml
 create mode 100644 kate/data/hunspell-idx.xml
 create mode 100644 kate/data/j.xml
 create mode 100644 kate/data/ld.xml
 create mode 100644 kate/data/lsl.xml
 create mode 100644 kate/data/mandoc.xml
 create mode 100644 kate/data/metafont.xml
 create mode 100644 kate/data/nagios.xml
 create mode 100644 kate/data/q.xml
 create mode 100644 kate/data/replicode.xml
 create mode 100644 kate/data/roff.xml
 create mode 100644 kate/data/rtf.xml

diff --git a/kate/data/4dos.xml b/kate/data/4dos.xml
new file mode 100644
index 000000000..f4f4e6798
--- /dev/null
+++ b/kate/data/4dos.xml
@@ -0,0 +1,926 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+	<!ENTITY label		"[a-zA-Z_][a-zA-Z_0-9]*">				<!-- so sehen Labels aus -->
+	<!ENTITY varname	"([a-z_]\w*|[0-9]*[&amp;])">			<!-- valid character in a variable name -->
+	<!ENTITY pathpart	"[^&#34;&#42;&#61;/:&lt;&gt;?\\[\]\|]">	<!-- valid character in a file name -->
+	<!ENTITY tasten		"((Strg|Alt|Shift)-)?([a-z0-9]|F[1-9]|F1[0-2]|Esc|Bksp|Tab|Enter|Up|Down|Left|Right|PgUp|PgDn|Home|End|Ins|Del)">
+]>
+<language name="4DOS BatchToMemory" kateversion="2.4" version="1.0" section="Scripts" extensions="*.btm" casesensitive="0" author="Stefan Huebner (st0ff@npl.de)" license="LGPL">
+<!--DONE:
+	- comments are there
+	- substitutions are there
+	- basic variable function handling, distinguishing the function result between numerical and string
+	- variables are there (somehow)
+	- numbers will be found
+	- escape characters are found and highlit
+	- jumps, gosubs and labels
+	- command grouping
+	- conditions
+	- redirection
+	- many different command handlings
+		- iff
+		- echo
+		- text/endtext
+		- set/unset
+		- input/inkey
+		- do
+		- for
+		- switch
+	- internal commands of 4DOS
+	TODO:
+	- if someone finds that PATH-detection makes sense: create it...
+	- whatever doesn't seem to be correctly lit after all the preceeding stuff ...
+	- follow the TODO-Marks
+-->
+	<highlighting>
+                <list name="HighlightInsideComment">
+                        <item> todo </item>
+                        <item> attention </item>
+                        <item> attn </item>
+                        <item> fixme </item>
+                        <item> achtung </item>
+                        <item> info </item>
+                </list>
+                <list name="IntFunctions">
+                        <item> DOSMEM </item>   <!-- b|k|m-->
+                        <item> EMS </item>        <!-- b|k|m-->
+                        <item> EXTENDED </item>   <!-- b|k|m-->
+                        <item> XMS </item>        <!-- b|k|m-->
+                        <item> CDROM </item>      <!--string-->
+                        <item> CLUSTSIZE </item>  <!--string-->
+                        <item> CODEPAGE </item>   <!--string-->
+                        <item> COM </item>        <!--   int-->
+                        <item> DEVICE </item>   <!--string-->
+                        <item> DISKFREE </item>   <!--string, b|k|m-->
+                        <item> DISKTOTAL </item>  <!--string, b|k|m-->
+                        <item> DISKUSED </item>   <!--string, b|k|m-->
+                        <item> DRIVETYPE </item>  <!--string-->
+                        <item> HDDSIZE </item>  <!--string, b|k|m-->
+                        <item> LPT </item>        <!--   int-->
+                        <item> READY </item>      <!--string-->
+                        <item> REMOTE </item>   <!--string-->
+                        <item> REMOVABLE </item>  <!--string-->
+                        <item> ATTRIB </item>   <!--string,-n|r|h|s|a|d,p]--><!--ATTENTION : nur mit 2 Parametern wird ein Int returned-->
+                        <item> COMPARE </item>  <!--string-->
+                        <item> FILEAGE </item>  <!--string,a|c|w]-->
+                        <item> FILECLOSE </item>  <!--   int-->
+                        <item> FILEOPEN </item>   <!--string, r|w|a,b|t]-->
+                        <item> FILEREAD </item>   <!--   int,   int]-->
+                        <item> FILEREADB </item>  <!--   int,   int-->
+                        <item> FILES </item>      <!--string,-n|r|h|s|a|d]-->
+                        <item> FILESEEK </item>   <!--   int,   int,   int-->
+                        <item> FILESEEKL </item>  <!--   int,   int-->
+                        <item> FILESIZE </item>   <!--string,char,char]]-->
+                        <item> FILEWRITE </item>  <!--   int,string-->
+                        <item> FILEWRITEB </item> <!--   int,   int,string-->
+                        <item> FINDCLOSE </item>  <!--string-->
+                        <item> LINES </item>      <!--string-->
+                        <item> ASCII </item>      <!--  char-->
+                        <item> COUNT </item>      <!--  char,string-->
+                        <item> FIELDS </item>   <!--"string",]string-->
+                        <item> INDEX </item>      <!--string,string,int]-->
+                        <item> ISALNUM </item>  <!--string-->
+                        <item> ISALPHA </item>  <!--string-->
+                        <item> ISASCII </item>  <!--string-->
+                        <item> ISCNTRL </item>  <!--string-->
+                        <item> ISDIGIT </item>  <!--string-->
+                        <item> ISLOWER </item>  <!--string-->
+                        <item> ISPRINT </item>  <!--string-->
+                        <item> ISPUNCT </item>  <!--string-->
+                        <item> ISSPACE </item>  <!--string-->
+                        <item> ISUPPER </item>  <!--string-->
+                        <item> ISXDIGIT </item>   <!--string-->
+                        <item> LEN </item>        <!--string-->
+                        <item> SIMILAR </item>  <!--string,string-->
+                        <item> WILD </item>     <!--string,string-->
+                        <item> WORDS </item>      <!--"string",]string-->
+                        <item> ABS </item>        <!-- float-->
+                        <item> AVERAGE </item>  <!-- float,float,float...]]]-->
+                        <item> CEILING </item>  <!-- float-->
+                        <item> CONVERT </item>  <!--   int,   int,   int-->
+                        <item> DEC </item>        <!--expression-->
+                        <item> DECIMAL </item>  <!-- float-->
+                        <item> DIGITS </item>   <!--string-->
+                        <item> EVAL </item>     <!--expression-->
+                        <item> FLOOR </item>      <!-- float-->
+                        <item> INC </item>        <!--expression-->
+                        <item> INT </item>        <!-- float-->
+                        <item> MAX </item>        <!-- float,float,float...]]]-->
+                        <item> MIN </item>        <!-- float,float,float...]]]-->
+                        <item> NUMERIC </item>  <!--string-->
+                        <item> RANDOM </item>   <!-- float,float-->
+                        <item> DATE </item>     <!--  date-->
+                        <item> DAY </item>        <!--  date-->
+                        <item> DOWI </item>     <!--  date-->
+                        <item> DOY </item>        <!--  date-->
+                        <item> ISODOWI </item>  <!--  date-->
+                        <item> ISOWEEK </item>  <!--  date-->
+                        <item> ISOWYEAR </item>   <!--  date-->
+                        <item> MAKEAGE </item>  <!--  date,time]-->
+                        <item> MONTH </item>      <!--  date-->
+                        <item> TIME </item>     <!--  time-->
+                        <item> YEAR </item>     <!--  date-->
+                        <item> EXEC </item>     <!--expression-->
+                        <item> INIWRITE </item>   <!--string,string,string,string-->
+                </list>
+                <list name="StringFunctions">
+                        <item> DDCSTR </item>   <!--   int-->
+                        <item> MASTER </item>   <!--string-->
+                        <item> READSCR </item>  <!--   int,   int,   int-->
+                        <item> SMBSTR </item>   <!--   int,   int-->
+                        <item> CWD </item>        <!--string-->
+                        <item> CWDS </item>     <!--string-->
+                        <item> FSTYPE </item>   <!--string-->
+                        <item> LABEL </item>      <!--string-->
+                        <item> SERIAL </item>   <!--string-->
+                        <item> ATTRIB </item>   <!--string--><!--ATTENTION : nur mit 1 Parameter wird ein String returned-->
+                        <item> FILEDATE </item>   <!--string,acw],n]]-->
+                        <item> FILETIME </item>   <!--string,acw],s]]-->
+                        <item> FINDFIRST </item>  <!--string,-n|r|h|s|a|d]-->
+                        <item> FINDNEXT </item>   <!--string,-n|r|h|s|a|d]-->
+                        <item> LINE </item>     <!--string,   int-->
+                        <item> MD5 </item>        <!--string-->
+                        <item> SEARCH </item>   <!--string,string]-->
+                        <item> SHA1 </item>     <!--string-->
+                        <item> TRUENAME </item>   <!--string-->
+                        <item> UNIQUE </item>   <!--string-->
+                        <item> ALTNAME </item>  <!--string-->
+                        <item> EXPAND </item>   <!--string,-n|r|h|s|a|d]-->
+                        <item> EXT </item>        <!--string-->
+                        <item> FILENAME </item>   <!--string-->
+                        <item> FULL </item>     <!--string-->
+                        <item> LFN </item>        <!--string-->
+                        <item> NAME </item>     <!--string-->
+                        <item> PATH </item>     <!--string-->
+                        <item> QUOTE </item>      <!--string-->
+                        <item> SFN </item>        <!--string-->
+                        <item> UNQUOTE </item>  <!--string-->
+                        <item> UNQUOTES </item>   <!--string-->
+                        <item> ASCII </item>      <!--string-->
+                        <item> CAPS </item>     <!--"string",string-->
+                        <item> CHAR </item>     <!--space-delimited list of int-->
+                        <item> FIELD </item>      <!--"string",] int,string-->
+                        <item> FORMAT </item>   <!--string,string-->
+                        <item> INSERT </item>   <!--   int,string,string-->
+                        <item> INSTR </item>      <!--   int,   int,string-->
+                        <item> LCS </item>        <!--string,string-->
+                        <item> LEFT </item>     <!--   int,string-->
+                        <item> LOWER </item>      <!--string-->
+                        <item> LTRIM </item>      <!--string,string-->
+                        <item> REPEAT </item>   <!--  char,   int-->
+                        <item> REPLACE </item>  <!--string,string,string-->
+                        <item> RIGHT </item>      <!--   int,string-->
+                        <item> RTRIM </item>      <!--string,string-->
+                        <item> REVERSE </item>  <!--string-->
+                        <item> STRIP </item>      <!--string,string-->
+                        <item> SUBST </item>      <!--   int,string,string-->
+                        <item> SUBSTR </item>   <!--   int,   int,string-->
+                        <item> TRIM </item>     <!--string-->
+                        <item> UPPER </item>      <!--string-->
+                        <item> WORD </item>     <!--"string",]n,string-->
+                        <item> COMMA </item>      <!-- float-->
+                        <item> AGEDATE </item>  <!--   int,format]-->
+                        <item> DATECONV </item>   <!--string,format]-->
+                        <item> DOW </item>        <!--  date-->
+                        <item> DOWF </item>     <!--  date-->
+                        <item> MAKEDATE </item>   <!--   int-->
+                        <item> MAKETIME </item>   <!--   int-->
+                        <item> MONTHF </item>   <!--  date-->
+                        <item> ALIAS </item>      <!--string-->
+                        <item> CLIP </item>     <!--string-->
+                        <item> CLIPW </item>      <!--string-->
+                        <item> EXECSTR </item>  <!--string-->
+                        <item> FUNCTION </item>   <!--string-->
+                        <item> HISTORY </item>  <!--   int,   int]-->
+                        <item> IF </item>               <!--condition,string,string-->
+                        <item> INIREAD </item>  <!--string,string,string-->
+                        <item> SELECT </item>   <!--string,   int,   int,   int,   int,string-->
+                        <item> TIMER </item>      <!--   int-->
+                </list>
+                <list name="IfCommand">         <item> if </item>               </list>
+                <list name="IffCommand">        <item> iff </item>              </list>
+                <list name="TextCommand">       <item> text </item>             </list>
+                <list name="InputCommand">      <item> input </item>    </list>
+                <list name="InkeyCommand">  <item> inkey </item>        </list>
+                <list name="DoCommand">  <item> do </item>              </list>
+                <list name="EnddoCommand">  <item> enddo </item>        </list>
+                <list name="SkipdoCommand">
+                        <item> iterate </item>
+                        <item> leave </item>
+                </list>
+                <list name="SwitchCommand">     <item> switch </item>   </list>
+                <list name="TestErrorlevel"><item> errorlevel </item></list>
+                <list name="TestStatusVarname">
+                        <item> defined </item>
+                        <item> isalias </item>
+                        <item> isfunction </item>
+                        <item> isinternal </item>
+                        <item> islabel </item>
+                </list>
+                <list name="SetCommand">
+                        <item> set </item>
+                        <item> function </item>
+                        <item> alias </item>
+                </list>
+                <list name="UnsetCommand">
+                        <item> ENDLOCAL </item>
+                        <item> UNALIAS </item>
+                        <item> UNFUNCTION </item>
+                        <item> UNSET </item>
+                </list>
+                <list name="BadCommands">
+                        <item> for </item>
+                        <item> else </item>
+                        <item> elseiff </item>
+                        <item> endiff </item>
+                        <item> enddo </item>
+                        <item> endtext </item>
+                        <item> case </item>
+                        <item> endswitch </item>
+                        <item> default </item>
+                        <!-- the following is only valid within a do-loop.  But obviously I didn't think about it twice:
+                                if inside a do-loop we enter an iff/endiff construct, we switch contexts and the "leave" will
+                                not be found by the "insideDo" context.  There would need to be a way to create a dynamic list
+                                of keywords that can be shorted or expanded by a specific context, so that the above wouldn't
+                                happen. -->
+                        <!--item> iterate </item>
+                        <item> leave </item-->
+                </list>
+                <list name="NeedOnOffCommands">
+                        <item> BREAK </item>
+                        <item> IDLE </item>
+                        <item> LFNFOR </item>
+                        <item> LOADBTM </item>
+                        <item> SWAPPING </item>
+                        <item> TRANSIENT </item>
+                        <item> VERIFY </item>
+                </list>
+                <list name="TakeAFileNameCommands">
+                        <item> CALL </item>
+                        <item> CD </item>
+                        <item> CHDIR </item>
+                        <item> CDD </item>
+                        <item> DIR </item>
+                        <item> ERASE </item>
+                        <item> DEL </item>
+                        <item> DESCRIBE </item>
+                        <item> HEAD </item>
+                        <item> MD </item>
+                        <item> MKDIR </item>
+                        <item> RD </item>
+                        <item> RMDIR </item>
+                        <item> PUSHD </item>
+                        <item> REN </item>
+                        <item> RENAME </item>
+                        <item> TOUCH </item>
+                </list>
+                <list name="simpleNoChecksCommands">
+                        <item> BEEP </item>
+                        <item> CANCEL </item>
+                        <item> DATE /T </item>
+                        <item> FREE </item>
+                        <item> KEYBD </item>
+                        <item> ELSE </item>
+                        <item> PAUSE </item>
+                        <item> POPD </item>
+                        <item> QUIT </item>
+                        <item> SETDOS </item>
+                        <item> SHIFT </item>
+                        <item> TAIL </item>
+                        <item> TEE </item>
+                        <item> TIME </item>
+                        <item> TIMER </item>
+                        <item> TYPE </item>
+                </list>
+                <list name="NeedAnIntegerCommands">
+                        <item> CHCP </item>
+                        <item> DELAY </item>
+                        <item> COUNTRY </item>
+                        <item> SETERROR </item>
+                </list>
+                <list name="TakeColorsCommands">
+                        <item> CLS </item>
+                        <item> COLOR </item>
+                </list>
+                <list name="FilesystemOperationCommands">
+                        <item> ATTRIB </item>
+                        <item> COPY </item>
+                        <item> FFIND </item>
+                        <item> MOVE </item>
+                </list>
+                <list name="DrawCommands">
+                        <item> DRAWBOX </item>
+                        <item> DRAWHLINE </item>
+                        <item> DRAWVLINE </item>
+                        <item> SCREEN </item>
+                        <item> SCRPUT </item>
+                        <item> VSCRPUT </item>
+                </list>
+                <list name="NeedsACommandCommands">
+                        <item> EXCEPT </item>
+                        <item> GLOBAL </item>
+                </list>
+                <list name="NoParametersAtAllCommands">
+                        <item> SETLOCAL </item>
+                </list>
+                <list name="OnOff">
+                        <item> on </item>
+                        <item> off </item>
+                </list>
+		<contexts>
+			<context name="base" attribute="Normal" lineEndContext="#stay">
+				<IncludeRules context="findComments"/>
+				<IncludeRules context="findCommands"/>
+				<IncludeRules context="findCommandSeparator"/>
+				<IncludeRules context="findStrings"/>	<!-- includes "findSubstitution"-->
+			</context>
+<!--
+	the following contexts are meant to be included in other contexts.
+-->
+	<!-- find any comments (we were even keen enough to highlight things like TODO/FIXME and so on)-->
+			<context name="findComments" attribute="Normal" lineEndContext="#stay">
+				<Detect2Chars attribute="Comment" context="foundComment" char=":" char1=":" column="0"/>
+				<WordDetect attribute="Comment" context="foundComment" String="rem" insensitive="true"/>
+			</context>
+
+	<!-- whereever there should be a command start, the following should match in some way or another -->
+			<context name="findCommands" attribute="Normal" lineEndContext="#stay">
+				<!-- Highlight command groups and start/end corresponding folding region -->
+				<DetectChar attribute="Label" context="CommandGroup" char="(" beginRegion="true"/>
+				<!-- find Labels and jmp/jsr/rts commands -->
+				<IncludeRules context="findSpaghetti"/>
+				<!-- find commands that need special handling-->
+				<!-- TODO: replace single-item keyword lists with WordDetect as soon as WordDetect works properly again-->
+				<keyword attribute="Keyword" context="conditionLeft" String="IfCommand"/>
+				<keyword attribute="Keyword" context="cmdIff" String="IffCommand"/>
+				<!-- find all "echo"-variations -->
+				<RegExpr attribute="Keyword" String="[@]?echo\s+(on|off)(?=\s*($|\%\+|\)|\]))" insensitive="true"/>
+				<RegExpr attribute="Keyword" context="cmdEcho" String="\becho[s]?(err)?[\.]?" insensitive="true"/>
+				<!-- special treatment for Text and EndText -->
+				<keyword attribute="Keyword" context="cmdText" String="TextCommand" insensitive="true" beginRegion="true"/>
+				<!-- Set und Unset-Befehle -->
+				<keyword attribute="Keyword" context="cmdSet" String="SetCommand"/>
+				<keyword attribute="Keyword" context="cmdUnset" String="UnsetCommand"/>
+	<!-- inkey/input -->
+				<keyword attribute="Keyword" context="cmdInput" String="InputCommand"/>
+				<keyword attribute="Keyword" context="cmdInkey" String="InkeyCommand"/>
+				<!-- do loops -->
+				<keyword attribute="Keyword" context="cmdDo" String="DoCommand" beginRegion="true"/>
+				<!-- switch constructs -->
+				<keyword attribute="Keyword" context="cmdSwitch" String="SwitchCommand" beginRegion="true"/>
+					<!-- all the other internal 4DOS commands (with as little processing, as time permits) -->
+					<keyword attribute="Keyword" context="cmdNeedOnOff" String="NeedOnOffCommands"/>
+					<keyword attribute="Keyword" context="cmdTakeAFileName" String="TakeAFileNameCommands"/>
+					<keyword attribute="Keyword" context="cmdsimpleNoChecks" String="simpleNoChecksCommands"/>
+					<keyword attribute="Keyword" context="cmdNeedAnInteger" String="NeedAnIntegerCommands"/>
+					<keyword attribute="Keyword" context="cmdTakeColors" String="TakeColorsCommands"/>
+					<keyword attribute="Keyword" context="cmdFilesystemOperation" String="FilesystemOperationCommands"/>
+					<keyword attribute="Keyword" context="cmdDraw" String="DrawCommands"/>
+					<keyword attribute="Keyword" context="cmdNeedsACommand" String="NeedsACommandCommands"/>
+					<keyword attribute="Keyword" context="popNeedEndOfCommand" String="NoParametersAtAllCommands"/>
+				<!-- BAD COMMANDS:
+					 for :: if someone codes for 4DOS, he shall not use for-loops.  The way to go is using do-loops,
+							for-loops were just included into 4DOS to have M$-DOS command.com compatibility
+					 any other bad commands: are not available outside of their respective scopes, or it's the same
+					 as with "for"
+				-->
+					<keyword attribute="Error" context="Error" String="BadCommands"/>
+			</context>
+
+	<!-- find jumps, labels and subroutine calls -->
+			<context name="findSpaghetti" attribute="Normal" lineEndContext="#stay">
+				<RegExpr attribute="Label" context="foundLabel" String="^:&label;" beginRegion="true" insensitive="true"/>
+				<RegExpr attribute="Label" context="foundSpagetti" String="(goto|gosub)\s+&label;" insensitive="true"/>
+				<WordDetect attribute="Label" String="return" insensitive="true" endRegion="true"/>
+			</context>
+
+	<!-- find any variable substitution-->
+			<context name="findSubstitution" attribute="Normal" lineEndContext="#stay">
+				<DetectChar context="substitutionFound" char="%" lookAhead="true"/>
+			</context>
+
+	<!-- findVariables just finds variable substitutions WITHOUT variable functions!!!-->
+			<context name="findVariables" attribute="Normal" lineEndContext="#stay">
+				<Detect2Chars attribute="VariableBold" context="substitutionIndirect" char="%" char1="["/>
+				<RegExpr attribute="Variable" String="%(([a-z_][a-z_0-9]*%?)|[0-9]+&amp;?|&amp;|\?+|_\?|#)" insensitive="true"/>
+			</context>
+
+	<!-- findNumbers finds Numbers and variableSubstitutions that may well be numbers-->
+			<context name="findNumbers" attribute="Normal" lineEndContext="#stay">
+				<RegExpr attribute="Number" String="\s*[+-]?\d*[,.]?\d+"/>
+				<Detect2Chars attribute="Function" context="substitutionFindIntFunction" char="%" char1="@"/>
+				<IncludeRules context="findVariables"/>
+			</context>
+
+	<!-- findStrings should skip over Strings, highlighting any substitution inside-->
+			<context name="findStrings" attribute="Normal" lineEndContext="#stay">
+				<DetectChar attribute="Escape" context="foundStringBackQuote" char="`"/>
+				<DetectChar attribute="String" context="foundStringQuote" char="&quot;"/>
+				<IncludeRules context="findEscapes"/>
+				<IncludeRules context="findSubstitution"/>
+				<!-- a Number may well be interpreted as a string in 4dos, also -->
+				<RegExpr attribute="Number" String="\s*[+-]?\d*[,.]?\d+"/>
+				<!-- the following highlights ANSI-Escape-Sequences -->
+				<RegExpr attribute="Escape" String="\x1b\[.*[fhlmpsuABCDHJKR]" minimal="true"/>
+			   <!--
+					we shall find strings - so why don't we find at least literal words?
+
+					There is one simple answer: if we are inside a context that shall highlight strings,
+					then "findStrings" is included, to find things that evaluate to some kind of string.
+					Normal plaintext strings shall be lit by the context itself.
+				-->
+			</context>
+
+	<!-- highlight escaped characters -->
+			<context name="findEscapes" attribute="Normal" lineEndContext="#stay">
+				<RegExpr attribute="Escape" context="foundANSIEscape" String="&#37;&#61;e\[(?=.*[fhlmpsuABCDHJKR])" minimal="true"/>
+				<RegExpr attribute="Escape" String="\x18.|&#37;&#61;."/>
+			</context>
+
+	<!-- highlight the command seperator without changing contexts -->
+			<context name="findCommandSeparator" attribute="Normal" lineEndContext="#stay">
+				<Detect2Chars attribute="Keyword" char="%" char1="+"/>
+			</context>
+
+	<!-- highlight the command seperator and pop a context -->
+			<context name="popNeedEndOfCommand" attribute="Error" lineEndContext="#pop">
+				<Detect2Chars attribute="Keyword" context="#pop" char="%" char1="+"/>
+				<DetectSpaces attribute="Normal"/>
+			</context>
+
+	<!-- Entry Point for finding conditions -->
+			<context name="findCondition" attribute="Normal" lineEndContext="#stay">
+				<RegExpr attribute="Error" context="conditionLeft" String="(not\s+)*(((dir)?exist|isdir|defined|is(alias|function|label|internal)|errorlevel)|(.+((\s*(==|!=)\s*)|(\s+(eq|ne|gt|ge|lt|le|eqc)\s+)).+))" lookAhead="true" insensitive="true"/>
+			</context>
+
+	<!-- find redirections -->
+			<context name="findRedirection" attribute="Error" lineEndContext="#stay">
+				<DetectChar attribute="Keyword" context="RedirectionInput1st" char="&lt;"/>
+				<RegExpr attribute="Keyword" context="RedirectionOutput1st" String="[&gt;]{1,2}[&amp;]?[&gt;]?"/>
+			</context>
+
+	<!-- find any Option -->
+			<context name="findOption" attribute="Option" lineEndContext="#stay">
+				<DetectChar attribute="Option" context="Option" char="/"/>
+			</context>
+
+
+<!--
+Here we start with functional contexts.  These actually do something more than just find something and should not be sourced directly
+-->
+			<context name="CommandGroup" attribute="Normal" lineEndContext="#stay">
+				<DetectChar attribute="Label" context="#pop" char=")" endRegion="true"/>
+				<IncludeRules context="base"/>
+			</context>
+
+	<!-- Highlight ANSI Escap-Sequences - the "%=e[" are already eaten up -->
+			<context name="foundANSIEscape" attribute="String" lineEndContext="#pop">
+				<IncludeRules context="findStrings"/>
+				<AnyChar attribute="Escape" context="#pop" String="fhlmpsuABCDHJKR"/>
+			</context>
+
+	<!-- if any substitution was found, we get here ... -->
+			<context name="substitutionFound" attribute="Error" lineEndContext="#pop">
+				<Detect2Chars attribute="Function" context="#pop!substitutionFindFunction" char="%" char1="@"/>
+				<Detect2Chars attribute="VariableBold" context="#pop!substitutionIndirect" char="%" char1="["/>
+				<RegExpr attribute="Variable" context="#pop" String="%((([a-z_][a-z_0-9]*)%?)|[0-9]+&amp;?|&amp;|\?+|_\?|#)" insensitive="true"/>
+				<!-- in @EVAL there is the modulo-operator %% - we'll have to filter it out!
+					 TODO: give eval a special handler and remove the following rule. -->
+				<Detect2Chars attribute="Operator" context="#pop" char="%" char1="%"/>
+			</context>
+
+			<context name="substitutionFindFunction" attribute="Error" lineEndContext="#pop">
+				<!-- TODO: add special function handlers for
+						execstr
+						if
+				-->
+				<keyword attribute="Function" context="#pop!substitutionFunctionFound" String="StringFunctions"/>
+				<IncludeRules context="substitutionFindIntFunction"/>
+			</context>
+
+			<context name="substitutionFindIntFunction" attribute="Error" lineEndContext="#pop">
+				<!-- TODO: add special function handlers for
+						eval
+				-->
+				<keyword attribute="Function" context="#pop!substitutionFunctionFound" String="IntFunctions"/>
+				<RegExpr attribute="Function" context="#pop!substitutionFunctionFound" String="&label;(?=\[)" insensitive="true"/>
+			</context>
+
+	<!-- Variable Functions - the Masterpower of 4DOS -> we'll make this more complex later on!-->
+			<context name="substitutionFunctionFound" attribute="Error" lineEndContext="Error">
+				<DetectChar attribute="Function" context="#pop!findFunctionParameters" beginRegion="true" char="["/>
+			</context>
+
+			<context name="findFunctionParameters" attribute="String" lineEndContext="Error">
+				<DetectChar attribute="Function" char=","/>
+				<DetectChar attribute="Function" context="#pop" endRegion="true" char="]"/>
+				<IncludeRules context="findStrings"/>
+			</context>
+
+	<!-- indirect Substitutions - they need to find their ending braces-->
+			<context name="substitutionIndirect" attribute="Variable" lineEndContext="Error">
+				<DetectChar attribute="VariableBold" context="#pop" endRegion="true" char="]"/>
+				<IncludeRules context="findStrings"/>
+			</context>
+
+	<!-- Strings within quotes -->
+			<context name="foundStringBackQuote" attribute="String" lineEndContext="#pop">
+				<DetectChar attribute="Escape" context="#pop" char="`"/>
+			</context>
+
+			<context name="foundStringQuote" attribute="String" lineEndContext="#pop">
+				<DetectChar attribute="String" context="#pop" char="&quot;"/>
+				<IncludeRules context="findStrings"/>
+			</context>
+
+	<!-- stuff inside comments ... (a comment always runs until EOL) -->
+			<context name="foundComment" attribute="Comment" lineEndContext="#pop">
+				<keyword attribute="Alert" String="HighlightInsideComment"/>
+			</context>
+
+	<!-- Label definitions including parameter definitions for Gosub-->
+			<context name="foundLabel" attribute="Error" lineEndContext="#pop">
+				<!-- Wir suchen nach Parameterdefinitionen für GOSUBs, alles andere sind Fehler! -->
+				<DetectChar attribute="Label" context="#pop!foundLabelParameters" char="["/>
+				<DetectSpaces attribute="Normal"/>
+			</context>
+
+			<context name="foundLabelParameters" attribute="Error" lineEndContext="#pop">
+				<DetectIdentifier attribute="Variable" context="#stay"/>
+				<DetectChar attribute="Label" context="#pop" char="]"/>
+				<DetectSpaces attribute="Normal"/>
+			</context>
+
+	<!-- highlight gosubs and gotos with additional parameters (only valid with gosub, actually)-->
+			<context name="foundSpagetti" attribute="Normal" lineEndContext="#pop">
+				<IncludeRules context="popNeedEndOfCommand"/>
+				<IncludeRules context="findStrings"/>
+			</context>
+
+   <!-- Rules that highlight conditions (include the entry point "findCondition" to start this as a context that pops behind the condition(s))-->
+			<context name="conditionLeft" attribute="Normal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop!conditionLeftStandard">
+				<RegExpr attribute="Normal" context="conditionNot" String="\bnot\b" lookAhead="true" insensitive="true"/>
+				<keyword attribute="Label" context="#pop!conditionVarname" String="TestStatusVarname"/>
+				<!-- the end of a filename comes with any non-quoted space - so we need to eat up the first space after exist etc.-->
+				<RegExpr attribute="Label" context="#pop!conditionFileTest" String="((dir)?exist|isdir)\s+" insensitive="true"/>
+				<keyword attribute="Label" context="#pop!conditionErrorlevel" String="TestErrorlevel"/>
+				<DetectSpaces/>
+			</context>
+
+			<context name="conditionNot" attribute="Error" lineEndContext="#pop#pop">
+				<!-- the context itself highlights everything as Error - just this rule finds the last not -->
+				<RegExpr attribute="Alert" context="#pop" String="\bnot\b(?!\s*not\b)" insensitive="true"/>
+			</context>
+
+			<context name="conditionVarname" attribute="Normal" lineEndContext="#pop">
+				<!-- basic variable name check just finds an identifier -->
+				<DetectIdentifier attribute="Variable" context="#pop!conditionEnd"/>
+				<!-- TODO: further checking, as a varname can also be calculated -->
+			</context>
+
+			<context name="conditionFileTest" attribute="String" lineEndContext="#pop">
+				<IncludeRules context="findStrings"/>
+				<DetectSpaces context="#pop!conditionEnd"/>
+			</context>
+
+			<context name="conditionErrorlevel" attribute="Normal" lineEndContext="#pop">
+				<DetectSpaces/>
+				<RegExpr attribute="Operator" String="==|!=|eq|ne|gt|ge|lt|le" insensitive="true"/>
+				<RegExpr attribute="Number" context="#pop!conditionEnd" String="\s*[+-]?\d*[,.]?\d+"/>
+				<!-- TODO: actually errorlevel-test can also take calculated numbers or int variables to test agains - but would we want to duplicate a lot of the functionality above again?-->
+			</context>
+
+			<context name="conditionEnd" attribute="Normal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+				<RegExpr attribute="Operator" context="#pop!conditionLeft" String="\.(and|(x)?or)\." insensitive="true"/>
+				<!--DetectSpaces/-->
+			</context>
+
+			<context name="conditionLeftStandard" attribute="Normal" lineEndContext="#pop">
+				<!--DetectSpaces/-->
+				<RegExpr attribute="Operator" context="#pop!conditionLeftEval" String="\s*(==|!=|eq|ne|gt|ge|lt|le)\s*" lookAhead="true" insensitive="true"/>
+				<IncludeRules context="findStrings"/>
+			</context>
+
+			<context name="conditionLeftEval" attribute="Normal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop!conditionRight">
+				<DetectSpaces/>
+				<RegExpr attribute="Operator" String="==|!=|eq|ne|gt|ge|lt|le|eqc" insensitive="true"/>
+			</context>
+
+			<context name="conditionRight" attribute="Normal" lineEndContext="#pop">
+				<IncludeRules context="findStrings"/>
+				<DetectSpaces context="#pop!conditionEnd"/>
+			</context>
+
+   <!-- Handle Iff correctly: condition, then, wait for possible else/handle elseiff find endiff-->
+			<context name="cmdIff" attribute="Normal" lineEndContext="#pop">
+				<IncludeRules context="findCondition"/>
+				<DetectSpaces/>
+				<!-- TODO: replace with WordDetect as soon as WordDetect works right-->
+				<RegExpr attribute="Keyword" context="#pop!cmdIffThen" beginRegion="true" String="\bthen\b\s*($|%\+)" insensitive="true"/>
+				<!-- should the above regex not match, there is an error... -->
+				<StringDetect attribute="Keyword" context="Error" String="then" insensitive="true"/>
+			</context>
+
+			<context name="cmdIffThen" attribute="Normal" lineEndContext="#stay">
+				<!-- TODO: replace with WordDetect as soon as WordDetect works right-->
+				<RegExpr attribute="Keyword" context="popNeedEndOfCommand" String="\belse\b" insensitive="true"/>
+				<RegExpr attribute="Keyword" context="cmdElseiff" String="\belseiff\b" insensitive="true"/>
+				<RegExpr attribute="Keyword" context="#pop!popNeedEndOfCommand" endRegion="true" String="\bendiff\b" insensitive="true"/>
+				<IncludeRules context="base"/>
+			</context>
+
+			<context name="cmdElseiff" attribute="Normal" lineEndContext="#pop">
+				<IncludeRules context="findCondition"/>
+				<DetectSpaces/>
+				<!-- TODO: replace with WordDetect as soon as WordDetect works right-->
+				<RegExpr attribute="Keyword" context="#pop" String="\bthen\b\s*($|%\+)" insensitive="true"/>
+				<!-- should the above regex not match, there is an error... -->
+				<StringDetect attribute="Keyword" context="Error" String="then" insensitive="true"/>
+			</context>
+
+	<!-- echo -->
+			<context name="cmdEcho" attribute="String" lineEndContext="#pop">
+				<IncludeRules context="findStrings"/>
+				<IncludeRules context="findRedirection"/>
+				<RegExpr attribute="Normal" context="#pop" String="\s*($|\%\+|\)|\])" lookAhead="true"/>
+			</context>
+
+	<!-- Redirection: kann ja auch mehrfach auftreten -->
+			<context name="Redirection" attribute="String" lineEndContext="#pop">
+				<DetectSpaces attribute="Normal" context="#stay"/>
+				<IncludeRules context="findStrings"/>
+				<IncludeRules context="popNeedEndOfCommand"/>
+			</context>
+
+			<context name="RedirectionOutput1st" attribute="String" lineEndContext="#pop">
+				<IncludeRules context="Redirection"/>
+				<DetectChar attribute="Redirection" context="#pop!Redirection" char="&lt;"/>
+			</context>
+
+			<context name="RedirectionInput1st" attribute="String" lineEndContext="#pop">
+				<IncludeRules context="Redirection"/>
+				<RegExpr attribute="Redirection" context="#pop!Redirection" String="[&gt;]{1,2}[&amp;]?[&gt;]?"/>
+			</context>
+
+	<!-- special treatment of text and endtext -->
+			<context name="cmdText" attribute="Error" lineEndContext="#pop!cmdEndText">
+				<DetectSpaces attribute="Normal" context="#stay"/>
+				<RegExpr attribute="Keyword" context="Redirection" String="[&gt;]{1,2}"/>
+			</context>
+
+			<context name="cmdEndText" attribute="String" lineEndContext="#stay">
+				<RegExpr attribute="Keyword" context="#pop" String="^\s*endtext\s*$" insensitive="true"/>
+	<!--	As we are pretty 31337, we also highlight ANSI-Escapes in Textblocks.
+			We're just not 1337 enough to also provide a syntactic checking for
+			those sequences...-->
+				<RegExpr attribute="Escape" String="\x1b\[.*[fhlmpsuABCDHJKR]" minimal="true"/>
+			</context>
+
+	<!-- Set/Unset commands -->
+			<context name="cmdUnset" attribute="Normal" lineEndContext="#pop">
+				<IncludeRules context="findOption"/>
+				<DetectIdentifier attribute="Variable" context="#stay"/>
+				<IncludeRules context="popNeedEndOfCommand"/>
+			</context>
+
+			<context name="cmdSet" attribute="Normal" lineEndContext="#pop">
+				<DetectChar attribute="Keyword" context="#pop" char="="/>
+				<IncludeRules context="cmdUnset"/>
+			</context>
+
+	<!-- Highlight an Option, #pop on next space ...-->
+			<context name="Option" attribute="Option" lineEndContext="#pop">
+				<IncludeRules context="findStrings"/>
+				<DetectSpaces attribute="Normal" context="#pop"/>
+			</context>
+
+	<!-- input und inkey - testing allowed Options ... -->
+			<context name="cmdInput" attribute="String" lineEndContext="#pop"
+					 fallthroughContext="#pop!inputMessage" fallthrough="true">
+				<IncludeRules context="input"/>
+				<RegExpr attribute="Option" String="/([en]|l[0-9]+)\s" insensitive="true"/>
+			</context>
+
+			<context name="cmdInkey" attribute="String" lineEndContext="#pop"
+					 fallthroughContext="#pop!inputMessage" fallthrough="true">
+				<RegExpr attribute="Option" context="inputKeysDP" String="/k:" insensitive="true"/>
+				<RegExpr attribute="Option" context="inputKeysAZ" String="/k\&quot;" insensitive="true"/>
+				<StringDetect attribute="Error" String="/k" insensitive="true"/>
+				<StringDetect attribute="Option" String="/m" insensitive="true"/>
+				<IncludeRules context="input"/>
+			</context>
+
+			<context name="input" attribute="Error" lineEndContext="#stay">
+				<RegExpr attribute="Option" String="/([cdpx]|[w][0-9]+)\s" insensitive="true"/>
+				<DetectSpaces attribute="Normal" context="#stay"/>
+			</context>
+
+			<context name="inputKeysDP" attribute="Error" lineEndContext="#pop#pop">
+				<DetectChar attribute="String" context="inputKeyDesc" char="["/>
+				<DetectSpaces attribute="Normal" context="#pop"/>
+				<RegExpr attribute="Function" String="\S"/>
+			</context>
+
+			<context name="inputKeysAZ" attribute="Error" lineEndContext="#pop#pop">
+				<DetectChar attribute="String" context="inputKeyDesc" char="["/>
+				<DetectChar attribute="Option" context="#pop" char="&quot;"/>
+				<RegExpr attribute="Function" String="\S"/>
+			</context>
+
+			<context name="inputKeyDesc" attribute="Error" lineEndContext="#pop#pop#pop">
+				<RegExpr attribute="Label" context="#pop!inputKeyDesc2" String="&tasten;"/>
+			</context>
+
+			<context name="inputKeyDesc2" attribute="Error" lineEndContext="#pop#pop#pop">
+				<DetectChar attribute="String" context="#pop" char="]"/>
+			</context>
+
+			<context name="inputMessage" attribute="String" lineEndContext="#pop">
+				<RegExpr attribute="Variable" context="#pop!popNeedEndOfCommand" String="%%[a-z_][a-z0-9_]*" insensitive="true"/>
+				<IncludeRules context="findStrings"/>
+			</context>
+
+	<!-- special treatment of DO -->
+			<context name="cmdDo" attribute="Error" lineEndContext="Error">
+				<!-- do n | forever-->
+				<RegExpr attribute="Label" context="#pop!insideDo" String="\s*forever(?=\s*$)" insensitive="true"/>
+				<RegExpr attribute="Variable" context="#pop!fixedDo" String="\s*(%|[0-9]+)" lookAhead="true"/>
+				<!-- WHILE | UNTIL -->
+				<RegExpr attribute="Label" context="#pop!conditionalDo" String="\s*(while|until)" insensitive="true"/>
+				<!-- varname = start TO end [BY n] | varname in blubberkram -->
+				<RegExpr attribute="Variable" context="#pop!countedDo" String="\s*&varname;" insensitive="true"/>
+			</context>
+
+			<context name="fixedDo" attribute="Error" lineEndContext="#pop!insideDo">
+				<DetectSpaces attribute="Normal"/>
+				<IncludeRules context="findNumbers"/>
+			</context>
+
+			<context name="countedDo" attribute="Error" lineEndContext="Error">
+				<RegExpr attribute="Keyword" context="#pop!countedDoIn" String="\bin\b" insensitive="true"/>
+				<DetectChar attribute="Keyword" context="#pop!countedDoStart" char="="/>
+				<DetectSpaces attribute="Normal"/>
+			</context>
+
+			<context name="countedDoIn" attribute="String" lineEndContext="#pop!insideDo">
+				<DetectSpaces/>
+				<IncludeRules context="findOption"/>
+				<IncludeRules context="findStrings"/>
+			</context>
+
+			<context name="countedDoStart" attribute="Error" lineEndContext="Error">
+				<RegExpr attribute="Keyword" context="#pop!countedDoTo" String="\bto\b" insensitive="true"/>
+				<IncludeRules context="findNumbers"/>
+				<DetectSpaces attribute="Normal"/>
+			</context>
+
+			<context name="countedDoTo" attribute="Error" lineEndContext="#pop!insideDo">
+				<IncludeRules context="findNumbers"/>
+				<DetectSpaces attribute="Normal"/>
+				<RegExpr attribute="Keyword" context="#pop!countedDoBy" String="\bby\b" insensitive="true"/>
+			</context>
+
+			<context name="countedDoBy" attribute="Error" lineEndContext="#pop!insideDo">
+				<IncludeRules context="findNumbers"/>
+				<DetectSpaces attribute="Normal"/>
+			</context>
+
+			<context name="conditionalDo" attribute="Error" lineEndContext="#pop!insideDo">
+				<IncludeRules context="findCondition"/>
+				<DetectSpaces attribute="Normal"/>
+			</context>
+
+			<context name="insideDo" attribute="Normal" lineEndContext="#stay">
+				<keyword attribute="Keyword" String="SkipdoCommand"/>
+				<keyword attribute="Keyword" endRegion="true" context="#pop!popNeedEndOfCommand" String="EnddoCommand"/>
+				<IncludeRules context="base"/>
+			</context>
+
+   <!-- special treatment of switch statements -->
+			<context name="cmdSwitch" attribute="Normal" lineEndContext="#pop!insideSwitch">
+				<IncludeRules context="findStrings"/>
+			</context>
+
+			<context name="insideSwitch" attribute="Normal" lineEndContext="#stay">
+				<RegExpr attribute="Keyword" context="#pop!switchDefault" String="\s*default\s*$" insensitive="true"/>
+				<IncludeRules context="switchDefault"/>
+			</context>
+			<!-- "Default" may be used only once, that's why we change contexts when it was found -->
+			<context name="switchDefault" attribute="Normal" lineEndContext="#stay">
+				<RegExpr attribute="Keyword" context="switchCase" String="\bcase\b" insensitive="true"/>
+				<RegExpr attribute="Keyword" context="#pop!popNeedEndOfCommand" String="\bendswitch\b" insensitive="true" endRegion="true"/>
+				<IncludeRules context="base"/>
+			</context>
+
+			<context name="switchCase" attribute="String" lineEndContext="#pop">
+				<DetectSpaces/>
+				<StringDetect attribute="Operator" insensitive="true" String=".or."/>
+				<IncludeRules context="findStrings"/>
+			</context>
+
+   <!-- internal commands of the 4DOS interpreter (TODO: make it even better, like integrated syntax checking) -->
+			<context name="cmdNeedOnOff" attribute="Error" lineEndContext="#pop">
+				<keyword attribute="String" context="#pop!popNeedEndOfCommand" String="OnOff"/>
+				<DetectSpaces attribute="Normal"/>
+			</context>
+
+			<context name="cmdNeedAnInteger" attribute="Error" lineEndContext="#pop">
+				<DetectSpaces attribute="Normal"/>
+				<IncludeRules context="findOption"/>
+				<IncludeRules context="findNumbers"/>
+				<IncludeRules context="popNeedEndOfCommand"/>
+			</context>
+
+			<context name="cmdNeedsACommand" attribute="String" lineEndContext="#pop">
+				<IncludeRules context="findOption"/>
+				<IncludeRules context="base"/>
+			</context>
+
+			<context name="cmdsimpleNoChecks" attribute="String" lineEndContext="#pop">
+				<IncludeRules context="findOption"/>
+				<IncludeRules context="findStrings"/>
+				<IncludeRules context="popNeedEndOfCommand"/>
+			</context>
+
+			<context name="cmdTakeAFileName" attribute="String" lineEndContext="#pop">
+				<IncludeRules context="findOption"/>
+				<IncludeRules context="findStrings"/>
+				<IncludeRules context="popNeedEndOfCommand"/>
+			</context>
+
+			<context name="cmdTakeColors" attribute="String" lineEndContext="#pop">
+				<RegExpr attribute="Operator" context="#pop!ColorHaveBrightFG" String="\bbri(ght)?\b" insensitive="true"/>
+				<RegExpr attribute="Operator" context="#pop!ColorHaveBlinkFG" String="\bbli(nk)?\b" insensitive="true"/>
+				<IncludeRules context="ColorHaveBlinkFG"/>
+			</context>
+
+			<context name="ColorHaveBrightFG" attribute="String" lineEndContext="Error">
+				<RegExpr attribute="Operator" context="#pop!ColorHaveBlinkFG" String="\bbli(nk)?\b" insensitive="true"/>
+				<IncludeRules context="ColorHaveBlinkFG"/>
+			</context>
+
+			<context name="ColorHaveBlinkFG" attribute="String" lineEndContext="Error">
+				<RegExpr attribute="Option" context="#pop!ColorHaveFG" insensitive="true" String="\b(Bla(ck)?|Blue?|Gre(en)?|Red|Mag(enta)?|Cyan?|Yel(low)?|Whi(te)?)\b"/>
+				<DetectSpaces/>
+			</context>
+
+			<context name="ColorHaveFG" attribute="String" lineEndContext="Error">
+				<RegExpr attribute="Keyword" context="#pop!ColorBG" insensitive="true" String="\s+on\s+"/>
+			</context>
+
+			<context name="ColorBG" attribute="String" lineEndContext="Error">
+				<RegExpr attribute="Operator" insensitive="true" String="\bbri(ght)?\b"/>
+				<RegExpr attribute="Option" context="#pop!ColorHaveBG" insensitive="true" String="\b(Bla(ck)?|Blue?|Gre(en)?|Red|Mag(enta)?|Cyan?|Yel(low)?|Whi(te)?)\b"/>
+			</context>
+
+			<context name="ColorHaveBG" attribute="String" lineEndContext="#pop">
+				<RegExpr attribute="Operator" context="#pop!ColorNeedBordercol" insensitive="true" String="\bBOR(der)?\b"/>
+				<IncludeRules context="popNeedEndOfCommand"/>
+			</context>
+
+			<context name="ColorNeedBordercol" attribute="String" lineEndContext="Error">
+				<RegExpr attribute="Option" context="#pop!popNeedEndOfCommand" insensitive="true" String="\s*(Bla(ck)?|Blue?|Gre(en)?|Red|Mag(enta)?|Cyan?|Yel(low)?|Whi(te)?)\b"/>
+			</context>
+
+			<context name="cmdDraw" attribute="String" lineEndContext="#pop">
+				<!-- ToDo: check if we'll have to split this into multiple contexts, add the highlighting for drawing commands -->
+			</context>
+
+			<context name="cmdFilesystemOperation" attribute="String" lineEndContext="#pop">
+				<IncludeRules context="findOption"/>
+				<IncludeRules context="findStrings"/>
+				<IncludeRules context="popNeedEndOfCommand"/>
+			</context>
+
+			<context name="Error" attribute="Error" lineEndContext="#stay">
+			</context>
+		</contexts>
+		<itemDatas>
+			<itemData name="Normal"	defStyleNum="dsNormal"/>
+			<itemData name="Comment"	  defStyleNum="dsComment"/>
+			<itemData name="Keyword"	  defStyleNum="dsKeyword"/>
+			<itemData name="Number"	defStyleNum="dsDecVal"/>
+			<itemData name="Option"	defStyleNum="dsDecVal"/>
+			<itemData name="Label"	  defStyleNum="dsOthers"/>
+			<itemData name="Function"	defStyleNum="dsFunction"/>
+			<itemData name="Redirection"  defStyleNum="dsKeyword"/>
+			<itemData name="String"	defStyleNum="dsString"/>
+			<itemData name="Escape"	defStyleNum="dsChar"/>
+			<itemData name="Path"		defStyleNum="dsDecVal"/>
+			<itemData name="Variable"	defStyleNum="dsDataType"/>
+			<itemData name="VariableBold" defStyleNum="dsDataType" bold="true"/>
+			<itemData name="Alert"	  defStyleNum="dsAlert"/>
+			<itemData name="Error"	  defStyleNum="dsError"/>
+			<itemData name="Operator"	defStyleNum="dsRegionMarker"/>
+		</itemDatas>
+	</highlighting>
+	<general>
+		<comments>
+			<comment name="singleLine" start="rem "/>
+			<comment name="singleLine" start="::"/>
+		</comments>
+		<keywords casesensitive="0" additionalDeliminator="@"/>
+		<indentation mode="cstyle"/>
+	</general>
+</language>
diff --git a/kate/data/CMakeLists.txt b/kate/data/CMakeLists.txt
index 9dc0f7681..2fa20670d 100644
--- a/kate/data/CMakeLists.txt
+++ b/kate/data/CMakeLists.txt
@@ -25,32 +25,33 @@ install( FILES
 
 install( FILES
     language.dtd syntax.template
-    abap.xml abc.xml actionscript.xml ada.xml ahdl.xml ahk.xml alert_indent.xml
+    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
     bibtex.xml bmethod.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 crk.xml
-    css.xml cs.xml cue.xml curry.xml c.xml ddoc.xml debianchangelog.xml
-    debiancontrol.xml desktop.xml diff.xml djangotemplate.xml dosbat.xml dot.xml
+    commonlisp.xml component-pascal.xml context.xml crk.xml css.xml
+    cs.xml cue.xml curry.xml c.xml ddoc.xml debianchangelog.xml debiancontrol.xml
+    desktop.xml diff.xml djangotemplate.xml dockerfile.xml dosbat.xml dot.xml
     doxygenlua.xml doxygen.xml dtd.xml d.xml eiffel.xml email.xml erlang.xml
-    euphoria.xml e.xml ferite.xml fgl-4gl.xml fgl-per.xml fortran.xml freebasic.xml
-    fsharp.xml fstab.xml gap.xml gcc.xml gdb.xml gdl.xml gettext.xml git-rebase.xml
-    glosstex.xml glsl.xml gnuassembler.xml gnuplot.xml go.xml grammar.xml haml.xml
-    haskell.xml html.xml idconsole.xml idl.xml ilerpg.xml inform.xml
+    euphoria.xml e.xml fasm.xml ferite.xml fgl-4gl.xml fgl-per.xml fortran.xml freebasic.xml
+    fsharp.xml fstab.xml ftl.xml gap.xml gcc.xml gdb.xml gdl.xml gettext.xml git-ignore.xml
+    git-rebase.xml gitolite.xml glosstex.xml glsl.xml gnuassembler.xml gnuplot.xml go.xml
+    grammar.xml haml.xml haskell.xml haxe.xml html.xml hunspell-aff.xml hunspell-dat.xml 
+    hunspell-dic.xml hunspell-idx.xml idconsole.xml idl.xml ilerpg.xml inform.xml
     ini.xml isocpp.xml jam.xml javadoc.xml javascript.xml java.xml json.xml
-    jsp.xml julia.xml kbasic.xml latex.xml ldif.xml less.xml lex.xml lilypond.xml
-    literate-curry.xml literate-haskell.xml logtalk.xml lpc.xml lua.xml m3u.xml
-    m4.xml mab.xml makefile.xml mako.xml mason.xml mathematica.xml matlab.xml maxima.xml
-    mediawiki.xml mel.xml mergetagtext.xml mips.xml modelica.xml modelines.xml
-    modula-2.xml monobasic.xml mup.xml nasm.xml nemerle.xml nesc.xml noweb.xml
-    objectivecpp.xml objectivec.xml ocaml.xml octave.xml oors.xml opal.xml opencl.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
+    maxima.xml mediawiki.xml mel.xml mergetagtext.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 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
-    purebasic.xml python.xml qmake.xml qml.xml qt4.xml rapidq.xml relaxngcompact.xml
-    relaxng.xml restructuredtext.xml rest.xml rexx.xml rhtml.xml rib.xml rpmspec.xml
-    rsiidl.xml ruby.xml r.xml sather.xml scala.xml scheme.xml sci.xml scss.xml
-    sed.xml sgml.xml sieve.xml sisu.xml sml.xml spice.xml sql-mysql.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 r.xml sather.xml scala.xml scheme.xml
+    sci.xml scss.xml sed.xml sgml.xml sieve.xml sisu.xml sml.xml spice.xml sql-mysql.xml
     sql-postgresql.xml sql.xml stata.xml systemc.xml systemverilog.xml tads3.xml
     tcl.xml tcsh.xml template-toolkit.xml texinfo.xml textile.xml tibasic.xml
     txt2tags.xml update-files.xml uscript.xml valgrind-suppression.xml
diff --git a/kate/data/Makefile.am b/kate/data/Makefile.am
index fe91bf7ab..1320d7a33 100644
--- a/kate/data/Makefile.am
+++ b/kate/data/Makefile.am
@@ -5,32 +5,33 @@ rckate_DATA = katepartui.rc katepartreadonlyui.rc
 
 syntaxkatedir = $(kde_datadir)/katepart/syntax
 syntaxkate_DATA = language.dtd syntax.template \
-    abap.xml abc.xml actionscript.xml ada.xml ahdl.xml ahk.xml alert_indent.xml \
+    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 \
     bibtex.xml bmethod.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 css-php.xml cs.xml cue.xml curry.xml c.xml ddoc.xml debianchangelog.xml \
-    debiancontrol.xml desktop.xml diff.xml djangotemplate.xml dosbat.xml dot.xml \
+    commonlisp.xml component-pascal.xml context.xml cpp.xml crk.xml css.xml \
+    css-php.xml cs.xml cue.xml curry.xml c.xml ddoc.xml debianchangelog.xml debiancontrol.xml \
+    desktop.xml diff.xml djangotemplate.xml dockerfile.xml dosbat.xml dot.xml \
     doxygenlua.xml doxygen.xml dtd.xml d.xml eiffel.xml email.xml erlang.xml \
-    euphoria.xml e.xml ferite.xml fgl-4gl.xml fgl-per.xml fortran.xml freebasic.xml \
-    fsharp.xml fstab.xml gap.xml gcc.xml gdb.xml gdl.xml gettext.xml git-rebase.xml \
-    glosstex.xml glsl.xml gnuassembler.xml gnuplot.xml go.xml grammar.xml haml.xml \
-    haskell.xml html.xml html-php.xml idconsole.xml idl.xml ilerpg.xml inform.xml \
-    ini.xml jam.xml javadoc.xml javascript.xml javascript-php.xml java.xml json.xml \
-    jsp.xml julia.xml kbasic.xml latex.xml ldif.xml less.xml lex.xml lilypond.xml \
-    literate-curry.xml literate-haskell.xml logtalk.xml lpc.xml lua.xml m3u.xml \
-    m4.xml mab.xml makefile.xml mako.xml mason.xml mathematica.xml matlab.xml maxima.xml \
-    mediawiki.xml mel.xml mergetagtext.xml mips.xml modelica.xml modelines.xml \
-    modula-2.xml monobasic.xml mup.xml nasm.xml nemerle.xml nesc.xml noweb.xml \
-    objectivecpp.xml objectivec.xml ocaml.xml octave.xml oors.xml opal.xml opencl.xml \
+    euphoria.xml e.xml fasm.xml ferite.xml fgl-4gl.xml fgl-per.xml fortran.xml freebasic.xml \
+    fsharp.xml fstab.xml ftl.xml gap.xml gcc.xml gdb.xml gdl.xml gettext.xml git-ignore.xml \
+    git-rebase.xml gitolite.xml glosstex.xml glsl.xml gnuassembler.xml gnuplot.xml go.xml \
+    grammar.xml haml.xml haskell.xml haxe.xml html.xml html-php.xml hunspell-aff.xml \
+    hunspell-dat.xml hunspell-dic.xml hunspell-idx.xml idconsole.xml idl.xml ilerpg.xml \
+    inform.xml ini.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 \
+    maxima.xml mediawiki.xml mel.xml mergetagtext.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 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 \
-    purebasic.xml python.xml qmake.xml qml.xml qt4.xml rapidq.xml relaxngcompact.xml \
-    relaxng.xml restructuredtext.xml rest.xml rexx.xml rhtml.xml rib.xml rpmspec.xml \
-    rsiidl.xml ruby.xml r.xml sather.xml scala.xml scheme.xml sci.xml scss.xml \
-    sed.xml sgml.xml sieve.xml sisu.xml sml.xml spice.xml sql-mysql.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 r.xml sather.xml scala.xml scheme.xml \
+    sci.xml scss.xml sed.xml sgml.xml sieve.xml sisu.xml sml.xml spice.xml sql-mysql.xml \
     sql-postgresql.xml sql.xml stata.xml systemc.xml systemverilog.xml tads3.xml \
     tcl.xml tcsh.xml template-toolkit.xml texinfo.xml textile.xml tibasic.xml \
     txt2tags.xml update-files.xml uscript.xml valgrind-suppression.xml \
diff --git a/kate/data/abap.xml b/kate/data/abap.xml
index 40e24ad69..91ac5e5ca 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.4" 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="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">
   <highlighting>
 
     <list name="keywords">
diff --git a/kate/data/actionscript.xml b/kate/data/actionscript.xml
index cea26395c..a77291665 100644
--- a/kate/data/actionscript.xml
+++ b/kate/data/actionscript.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="ActionScript 2.0" version="1.0" kateversion="2.4" section="Sources" extensions="*.as" mimetype="text/x-actionscript" license="LGPL" author="Aaron Miller (armantic101@gmail.com)"> 
+<language name="ActionScript 2.0" version="1.0" kateversion="2.3" section="Sources" extensions="*.as" mimetype="text/x-actionscript" license="LGPL" author="Aaron Miller (armantic101@gmail.com)">
   <highlighting>
     
     <list name="properties">
@@ -259,14 +259,14 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay">
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <RegExpr attribute="Decimal" context="#stay" String="//\s*BEGIN.*$" beginRegion="Region1"/>
diff --git a/kate/data/ahk.xml b/kate/data/ahk.xml
index 8539e6516..ebc7e1abd 100644
--- a/kate/data/ahk.xml
+++ b/kate/data/ahk.xml
@@ -1013,14 +1013,14 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay">
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <IncludeRules context="##Doxygen" />
         <DetectChar attribute="Comment" context="Commentar 1" char=";"/>
diff --git a/kate/data/alert_indent.xml b/kate/data/alert_indent.xml
index a03ea21a1..cc108f24b 100644
--- a/kate/data/alert_indent.xml
+++ b/kate/data/alert_indent.xml
@@ -26,13 +26,16 @@
  This file is included in every file that highlights the "alerts" keywords.
  That's why extensions and mimetype are empty.
 -->
-<language version="1.09-1" kateversion="2.3" name="Alerts_indent" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true">
+<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">
   <highlighting>
     <contexts>
       <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
         <IncludeRules context="##Alerts" />
       </context>
     </contexts>
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+    </itemDatas>
   </highlighting>
   <general>
     <folding indentationsensitive="1" />
diff --git a/kate/data/ample.xml b/kate/data/ample.xml
index d5298f15c..fe95dde70 100644
--- a/kate/data/ample.xml
+++ b/kate/data/ample.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="AMPLE" version="0.2" kateversion="2.4" section="Scripts" extensions="*.ample;*.menu;*.startup" mimetype="text/x-amplesrc" priority="5" author="Christian Parg (cparg@gmx.de)" license="Apache &amp; LGPL" >
+<language name="AMPLE" version="0.3" kateversion="2.4" section="Scripts" extensions="*.ample;*.menu;*.startup" mimetype="text/x-amplesrc" priority="5" author="Christian Parg (cparg@gmx.de)" license="Apache &amp; LGPL" >
 <!--
 #################################################################################################
 ## AMPLE Highlight file by Christian Parg (cparg_(at)_gmx_de)
@@ -3683,27 +3683,27 @@ Note: I used this hack to extract the functions from the reference documentation
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}"   endRegion="Brace1" />
         <Float attribute="Float" context="#stay">
-          <StringDetect attribute="Decimal" context="#stay" String="meg" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="f" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="p" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="n" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="u" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="m" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="k" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="g" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="t" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="meg" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="f" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="p" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="n" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="u" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="m" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="k" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="g" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="t" insensitive="true"/>
         </Float>
 
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="meg" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="f" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="p" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="n" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="u" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="m" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="k" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="g" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="t" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="meg" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="f" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="p" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="n" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="u" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="m" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="k" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="g" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="t" insensitive="true"/>
         </Int>
         <HlCChar      attribute="Char"    context="#stay"/>
         <DetectChar   attribute="String"  context="String" char="&quot;"/>
diff --git a/kate/data/ansic89.xml b/kate/data/ansic89.xml
index c4798c6ad..94e6d48b1 100644
--- a/kate/data/ansic89.xml
+++ b/kate/data/ansic89.xml
@@ -84,14 +84,14 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
diff --git a/kate/data/ansys.xml b/kate/data/ansys.xml
index 77daa70a5..9018a4282 100644
--- a/kate/data/ansys.xml
+++ b/kate/data/ansys.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Ansys" version="1.2" kateversion="2.0" section="Scientific" extensions="*.ans" author="Giovanni Bacci (giovanni@castellodilari.it)" license="LGPL" >
+<language name="Ansys" version="1.2" kateversion="2.4" section="Scientific" extensions="*.ans" author="Giovanni Bacci (giovanni@castellodilari.it)" license="LGPL" >
 <highlighting>
 	<list name="session_cmds">
 		<item>/BATCH</item>
diff --git a/kate/data/apache.xml b/kate/data/apache.xml
index db8b2cc1c..2740193f2 100644
--- a/kate/data/apache.xml
+++ b/kate/data/apache.xml
@@ -13,7 +13,7 @@ v1.0:
 -->
 
 <language name="Apache Configuration" section="Configuration"
-          version="1.11" kateversion="2.0"
+          version="1.11" kateversion="2.4"
           extensions="httpd.conf;httpd2.conf;apache.conf;apache2.conf;.htaccess*;.htpasswd*"
           mimetype=""
           author="Jan Janssen (medhefgo@googlemail.com)" license="LGPL">
diff --git a/kate/data/asm6502.xml b/kate/data/asm6502.xml
index 8d3e7261c..ddf971bec 100644
--- a/kate/data/asm6502.xml
+++ b/kate/data/asm6502.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Asm6502" version="1.04" kateversion="2.1" section="Assembler" extensions="*.asm" mimetype="text/x-asm6502">
+<language name="Asm6502" version="1.04" kateversion="2.2" section="Assembler" extensions="*.asm" mimetype="text/x-asm6502">
         <highlighting>
 
                 <contexts>
@@ -22,65 +22,65 @@
 				<RegExpr String= "\.zero" attribute = "Data Type" context="#stay"/>
 				<RegExpr String= "\.align" attribute = "Data Type" context="#stay"/>
 				<RegExpr String= "\$[A-Za-z0-9]*" attribute = "Hex" context="#stay"/>
-				<RegExpr String= ",x$" attribute = "Keyword" context="#stay"  insensitive="TRUE"/>
-				<RegExpr String= ",y$" attribute = "Keyword" context="#stay"  insensitive="TRUE"/>
-				<RegExpr String= "#" attribute = "Keyword" context="#stay"  insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="TAX" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="ADC" insensitive="TRUE"/>
-	 			<StringDetect attribute="Keyword" context="#stay" String="AND" insensitive="TRUE"/>
- 				<StringDetect attribute="Keyword" context="#stay" String="ASL" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="BCC" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="BCS" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="BEQ" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="BIT" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="BMI" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="BNE" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="BPL" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="BRK" insensitive="TRUE"/>
- 				<StringDetect attribute="Keyword" context="#stay" String="BVC" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="BVS" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="CLC" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="CLD" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="CLI" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="CLV" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="CMP" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="CPX" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="CPY" insensitive="TRUE"/>
- 				<StringDetect attribute="Keyword" context="#stay" String="DEC" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="DEX" insensitive="TRUE"/>
-	  			<StringDetect attribute="Keyword" context="#stay" String="DEY" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="EOR" insensitive="TRUE"/>
- 				<StringDetect attribute="Keyword" context="#stay" String="INC" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="INX" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="INY" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="JMP" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="JSR" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="LDA" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="LDX" insensitive="TRUE"/>
- 				<StringDetect attribute="Keyword" context="#stay" String="LDY" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="LSR" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="NOP" insensitive="TRUE"/>
-     				<StringDetect attribute="Keyword" context="#stay" String="ORA" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="PHA" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="PHP" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="PLA" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="PLP" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="ROL" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="ROR" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="RTI" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="RTS" insensitive="TRUE"/>
-  				<StringDetect attribute="Keyword" context="#stay" String="SBC" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="SEC" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="SED" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="SEI" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="STA" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="STX" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="STY" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="TAY" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="TSX" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="TXA" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="TXS" insensitive="TRUE"/>
-				<StringDetect attribute="Keyword" context="#stay" String="TYA" insensitive="TRUE"/>
+				<RegExpr String= ",x$" attribute = "Keyword" context="#stay"  insensitive="true"/>
+				<RegExpr String= ",y$" attribute = "Keyword" context="#stay"  insensitive="true"/>
+				<RegExpr String= "#" attribute = "Keyword" context="#stay"  insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="TAX" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="ADC" insensitive="true"/>
+	 			<StringDetect attribute="Keyword" context="#stay" String="AND" insensitive="true"/>
+ 				<StringDetect attribute="Keyword" context="#stay" String="ASL" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="BCC" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="BCS" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="BEQ" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="BIT" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="BMI" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="BNE" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="BPL" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="BRK" insensitive="true"/>
+ 				<StringDetect attribute="Keyword" context="#stay" String="BVC" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="BVS" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="CLC" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="CLD" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="CLI" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="CLV" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="CMP" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="CPX" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="CPY" insensitive="true"/>
+ 				<StringDetect attribute="Keyword" context="#stay" String="DEC" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="DEX" insensitive="true"/>
+	  			<StringDetect attribute="Keyword" context="#stay" String="DEY" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="EOR" insensitive="true"/>
+ 				<StringDetect attribute="Keyword" context="#stay" String="INC" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="INX" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="INY" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="JMP" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="JSR" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="LDA" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="LDX" insensitive="true"/>
+ 				<StringDetect attribute="Keyword" context="#stay" String="LDY" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="LSR" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="NOP" insensitive="true"/>
+     				<StringDetect attribute="Keyword" context="#stay" String="ORA" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="PHA" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="PHP" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="PLA" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="PLP" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="ROL" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="ROR" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="RTI" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="RTS" insensitive="true"/>
+  				<StringDetect attribute="Keyword" context="#stay" String="SBC" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="SEC" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="SED" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="SEI" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="STA" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="STX" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="STY" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="TAY" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="TSX" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="TXA" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="TXS" insensitive="true"/>
+				<StringDetect attribute="Keyword" context="#stay" String="TYA" insensitive="true"/>
 
 				<RegExpr String= "\*=" attribute = "Decimal" context="#stay"/>
 				<RangeDetect char = "&quot;" char1 = "&quot;" attribute = "String" context = "#stay"/>
diff --git a/kate/data/asp.xml b/kate/data/asp.xml
index 3a912b975..459cd1d65 100644
--- a/kate/data/asp.xml
+++ b/kate/data/asp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE  language SYSTEM "language.dtd">
-<language name="ASP" version="1.04" kateversion="2.1" section="Markup" extensions="*.asp;" mimetype="text/x-asp-src;text/x-asp-src" author="Antonio Salazar (savedfastcool@gmail.com)" license="LGPL">
+<language name="ASP" version="1.04" kateversion="2.3" section="Markup" extensions="*.asp;" mimetype="text/x-asp-src;text/x-asp-src" author="Antonio Salazar (savedfastcool@gmail.com)" license="LGPL">
     <highlighting>
         <list name="control structures">
             <item>select</item>
@@ -232,15 +232,15 @@
             <contexts>
             <context name="nosource" attribute="Normal Text" lineEndContext="#stay">
                 <StringDetect attribute="Keyword" context="aspsource" String="&lt;%" />
-                <RegExpr attribute="HTML Tag" context="aspsource" String="&lt;\s*script\s*language=&quot;VBScript&quot;[^&gt;]*&gt;" insensitive="TRUE" />
-                <RegExpr attribute="HTML Tag" context="scripts" String="&lt;\s*script(\s|&gt;)" insensitive="TRUE" />
+                <RegExpr attribute="HTML Tag" context="aspsource" String="&lt;\s*script\s*language=&quot;VBScript&quot;[^&gt;]*&gt;" insensitive="true" />
+                <RegExpr attribute="HTML Tag" context="scripts" String="&lt;\s*script(\s|&gt;)" insensitive="true" />
                 <RegExpr attribute="HTML Tag" context="htmltag" String="&lt;\s*\/?\s*[a-zA-Z_:][a-zA-Z0-9._:-]*" />
                 <StringDetect attribute="HTML Comment" context="htmlcomment" String="&lt;!--" />
             </context>
 
             <context name="aspsource" attribute="ASP Text" lineEndContext="#stay">
                 <StringDetect attribute="Keyword" context="#pop" String="%&gt;" />
-                <RegExpr attribute="HTML Tag" context="#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="TRUE" />
+                <RegExpr attribute="HTML Tag" context="#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="true" />
                 <DetectChar attribute="Comment" context="asp_onelinecomment" char="'" />
                 <DetectChar attribute="String" context="doublequotestring" char="&quot;" />
                 <DetectChar attribute="String" context="singlequotestring" char="&#39;" />
@@ -254,36 +254,36 @@
                 <AnyChar attribute="Other" context="#stay" String=";()}{:,[]" />
                 <keyword attribute="Other" context="#stay" String="Others" />
 
-                <RegExpr attribute="Control Structures" context="#stay" String="\belseif\b" insensitive="TRUE" beginRegion="iffi1" endRegion="iffi1"/>
-                <RegExpr attribute="Control Structures" context="#stay" String="\belse\b" insensitive="TRUE" beginRegion="iffi1" endRegion="iffi1"/>
-                <RegExpr attribute="Control Structures" context="#stay" String="\bif\b" insensitive="TRUE" beginRegion="iffi1"/>
-                <RegExpr attribute="Control Structures" context="#stay" String="\bend if\b" insensitive="TRUE" endRegion="iffi1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\belseif\b" insensitive="true" beginRegion="iffi1" endRegion="iffi1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\belse\b" insensitive="true" beginRegion="iffi1" endRegion="iffi1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bif\b" insensitive="true" beginRegion="iffi1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bend if\b" insensitive="true" endRegion="iffi1"/>
 
-                <RegExpr attribute="Keyword" context="#stay" String="\bexit function\b" insensitive="TRUE" />
-                <RegExpr attribute="Keyword" context="#stay" String="\bfunction\b" insensitive="TRUE" beginRegion="funendfun1"/>
-                <RegExpr attribute="Keyword" context="#stay" String="\bend function\b" insensitive="TRUE" endRegion="funendfun1"/>
+                <RegExpr attribute="Keyword" context="#stay" String="\bexit function\b" insensitive="true" />
+                <RegExpr attribute="Keyword" context="#stay" String="\bfunction\b" insensitive="true" beginRegion="funendfun1"/>
+                <RegExpr attribute="Keyword" context="#stay" String="\bend function\b" insensitive="true" endRegion="funendfun1"/>
 
-                <RegExpr attribute="Keyword" context="#stay" String="\bexit sub\b" insensitive="TRUE" />
-                <RegExpr attribute="Keyword" context="#stay" String="\bsub\b" insensitive="TRUE" beginRegion="subendsub1"/>
-                <RegExpr attribute="Keyword" context="#stay" String="\bend sub\b" insensitive="TRUE" endRegion="subendsub1"/>
+                <RegExpr attribute="Keyword" context="#stay" String="\bexit sub\b" insensitive="true" />
+                <RegExpr attribute="Keyword" context="#stay" String="\bsub\b" insensitive="true" beginRegion="subendsub1"/>
+                <RegExpr attribute="Keyword" context="#stay" String="\bend sub\b" insensitive="true" endRegion="subendsub1"/>
 
-                <RegExpr attribute="Keyword" context="#stay" String="\bclass\b" insensitive="TRUE" beginRegion="classendclass1"/>
-                <RegExpr attribute="Keyword" context="#stay" String="\bend class\b" insensitive="TRUE" endRegion="classendclass1"/>
+                <RegExpr attribute="Keyword" context="#stay" String="\bclass\b" insensitive="true" beginRegion="classendclass1"/>
+                <RegExpr attribute="Keyword" context="#stay" String="\bend class\b" insensitive="true" endRegion="classendclass1"/>
 
-                <RegExpr attribute="Control Structures" context="#stay" String="\bexit do\b" insensitive="TRUE" />
-                <RegExpr attribute="Control Structures" context="#stay" String="\bdo(\s+(while))?\b" insensitive="TRUE" beginRegion="doloop1"/>
-                <RegExpr attribute="Control Structures" context="#stay" String="\bloop\b" insensitive="TRUE" endRegion="doloop1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bexit do\b" insensitive="true" />
+                <RegExpr attribute="Control Structures" context="#stay" String="\bdo(\s+(while))?\b" insensitive="true" beginRegion="doloop1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bloop\b" insensitive="true" endRegion="doloop1"/>
 
-                <RegExpr attribute="Control Structures" context="#stay" String="\bexit while\b" insensitive="TRUE" />
-                <RegExpr attribute="Control Structures" context="#stay" String="\bwhile\b" insensitive="TRUE" beginRegion="whilewend1"/>
-                <RegExpr attribute="Control Structures" context="#stay" String="\bwend\b" insensitive="TRUE" endRegion="whilewend1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bexit while\b" insensitive="true" />
+                <RegExpr attribute="Control Structures" context="#stay" String="\bwhile\b" insensitive="true" beginRegion="whilewend1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bwend\b" insensitive="true" endRegion="whilewend1"/>
 
-                <RegExpr attribute="Control Structures" context="#stay" String="\bexit for\b" insensitive="TRUE" />
-                <RegExpr attribute="Control Structures" context="#stay" String="\bfor\b" insensitive="TRUE" beginRegion="fornext1"/>
-                <RegExpr attribute="Control Structures" context="#stay" String="\bnext\b" insensitive="TRUE" endRegion="fornext1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bexit for\b" insensitive="true" />
+                <RegExpr attribute="Control Structures" context="#stay" String="\bfor\b" insensitive="true" beginRegion="fornext1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bnext\b" insensitive="true" endRegion="fornext1"/>
 
-                <RegExpr attribute="Control Structures" context="#stay" String="\bselect case\b" insensitive="TRUE" beginRegion="selcase1"/>
-                <RegExpr attribute="Control Structures" context="#stay" String="\bend select\b" insensitive="TRUE" endRegion="selcase1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bselect case\b" insensitive="true" beginRegion="selcase1"/>
+                <RegExpr attribute="Control Structures" context="#stay" String="\bend select\b" insensitive="true" endRegion="selcase1"/>
 
                 <keyword attribute="Keyword" context="#stay" String="keywords" />
                 <keyword attribute="Control Structures" context="#stay" String="control structures" />
@@ -340,7 +340,7 @@
                 <keyword attribute="Keyword" context="#stay" String="keywords" />
                 <keyword attribute="Function" context="#stay" String="functions" />
                 <StringDetect attribute="Keyword" context="aspsource" String="&lt;%"/>
-                <RegExpr attribute="HTML Tag" context="#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="TRUE" />
+                <RegExpr attribute="HTML Tag" context="#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="true" />
 
                 <DetectChar attribute="String" context="doublequotestring" char="&quot;" />
                 <DetectChar attribute="String" context="singlequotestring" char="&#39;" />
@@ -354,7 +354,7 @@
                 <keyword attribute="Other" context="#stay" String="Others" />
             </context>
             <context name="scripts_onelinecomment" attribute="Comment" lineEndContext="#pop">
-                <RegExpr attribute="HTML Tag" context="#pop#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="TRUE" />
+                <RegExpr attribute="HTML Tag" context="#pop#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="true" />
             </context>
             <context name="twolinecomment" attribute="Comment" lineEndContext="#stay">
                 <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" />
diff --git a/kate/data/asterisk.xml b/kate/data/asterisk.xml
index e76a1e35c..4302e8ee0 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.4" section="Configuration" extensions="*asterisk/*.conf" mimetype="" author="UNGAR Didier" license="GPL">
+<language name="Asterisk" version="1.00" 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/awk.xml b/kate/data/awk.xml
index 28a2b06d8..882ea8b5f 100644
--- a/kate/data/awk.xml
+++ b/kate/data/awk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="AWK" version="0.92" kateversion="2.3" section="Scripts"
+<language name="AWK" version="0.93" kateversion="2.3" section="Scripts"
   extensions="*.awk" mimetype="text/x-awk" indenter="cstyle"
   license="LGPL">
 <!-- patched by igli#kate@irc:chat.freenode.net -->
@@ -87,7 +87,7 @@
 	<keyword String="special" attribute="Error" context="#stay"/>
 </context>
 
-<context name="base">
+<context name="base" attribute="Normal" lineEndContext="#stay">
 	<DetectSpaces />
 	<DetectChar char="#" context="Comment" attribute="Comment"/>
 	<DetectChar char="~" context="Match" attribute="Operator"/>
@@ -125,7 +125,7 @@
 	<IncludeRules context="regex"/>
 	<DetectChar char="/" context="#pop#pop" attribute="Regex Op"/>
 </context>
-<context name="regex">
+<context name="regex" attribute="Normal" lineEndContext="#stay">
 	<HlCStringChar attribute="Escape" context="#stay"/>
 	<DetectChar char="\" context="Regex Escape" attribute="Regex Op"/>
 	<Detect2Chars char="[" char1="^" context="RegexChar" attribute="Regex Op"/>
diff --git a/kate/data/c.xml b/kate/data/c.xml
index 01566d5d9..501e865e3 100644
--- a/kate/data/c.xml
+++ b/kate/data/c.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language name="C" section="Sources"
-          version="1.45" kateversion="2.4"
+          version="1.46" kateversion="2.4"
           indenter="cstyle"
           extensions="*.c;*.C;*.h"
           mimetype="text/x-csrc;text/x-c++src;text/x-chdr"
@@ -83,14 +83,14 @@
         <HlCHex attribute="Hex" context="#stay"/>
         <RegExpr attribute="Binary" context="#stay" String="0b[01]+[ul]{0,3}" insensitive="true" />
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
@@ -120,7 +120,9 @@
       </context>
 
       <context attribute="Error" lineEndContext="#pop" name="AfterHash">
-        <!-- define, elif, else, endif, error, if, ifdef, ifndef, include, include_next, line, pragma, undef, warning -->
+        <RegExpr attribute="Preprocessor" context="Include" String="#\s*(?:include|include_next)" insensitive="true" firstNonSpace="true" />
+
+        <!-- define, elif, else, endif, error, if, ifdef, ifndef, line, pragma, undef, warning -->
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
         <RegExpr attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
@@ -128,15 +130,20 @@
         <!-- folding for apple style #pragma mark - label -->
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*pragma\s+mark\s+-\s*$" insensitive="true" firstNonSpace="true" endRegion="pragma_mark" />
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*pragma\s+mark" insensitive="true" firstNonSpace="true" endRegion="pragma_mark" beginRegion="pragma_mark" />
-        
-        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|include(?:_next)?|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
+
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s+[0-9]+" insensitive="true" firstNonSpace="true" />
       </context>
 
-      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Include">
         <LineContinue attribute="Preprocessor" context="#stay"/>
         <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
         <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
+        <IncludeRules context="Preprocessor" />
+      </context>
+
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
+        <LineContinue attribute="Preprocessor" context="#stay"/>
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" />
diff --git a/kate/data/cisco.xml b/kate/data/cisco.xml
index 47c788807..471591527 100644
--- a/kate/data/cisco.xml
+++ b/kate/data/cisco.xml
@@ -245,14 +245,14 @@
 		</list>
 		<contexts>
                         <context name = "Base" attribute = "Normal Text" lineEndContext = "#stay">
-                                <RegExpr attribute="Keyword" context="#stay" String="\bdone\b" insensitive="TRUE" endRegion="dodone1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\bdo\b" insensitive="TRUE" beginRegion="dodone1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\belif\b" insensitive="TRUE" beginRegion="iffi1" endRegion="iffi1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\bif\b" insensitive="TRUE" beginRegion="iffi1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\bfi\b" insensitive="TRUE" endRegion="iffi1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\bcase\b" insensitive="TRUE" beginRegion="case1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="\besac\b" insensitive="TRUE" endRegion="case1"/>
-                                <RegExpr attribute="Keyword" context="#stay" String="[^()]+\)" insensitive="TRUE" beginRegion="subcase1" column="0"/>
+                                <RegExpr attribute="Keyword" context="#stay" String="\bdone\b" insensitive="true" endRegion="dodone1"/>
+                                <RegExpr attribute="Keyword" context="#stay" String="\bdo\b" insensitive="true" beginRegion="dodone1"/>
+                                <RegExpr attribute="Keyword" context="#stay" String="\belif\b" insensitive="true" beginRegion="iffi1" endRegion="iffi1"/>
+                                <RegExpr attribute="Keyword" context="#stay" String="\bif\b" insensitive="true" beginRegion="iffi1"/>
+                                <RegExpr attribute="Keyword" context="#stay" String="\bfi\b" insensitive="true" endRegion="iffi1"/>
+                                <RegExpr attribute="Keyword" context="#stay" String="\bcase\b" insensitive="true" beginRegion="case1"/>
+                                <RegExpr attribute="Keyword" context="#stay" String="\besac\b" insensitive="true" endRegion="case1"/>
+                                <RegExpr attribute="Keyword" context="#stay" String="[^()]+\)" insensitive="true" beginRegion="subcase1" column="0"/>
                                 <Detect2Chars attribute="Keyword" context="#stay" char=";" char1=";" endRegion="subcase1"/>
                                 <DetectChar attribute="Keyword" context="#stay" char="{" beginRegion="func1"/>
                                 <DetectChar attribute="Keyword" context="#stay" char="}" endRegion="func1"/>
diff --git a/kate/data/clipper.xml b/kate/data/clipper.xml
index 8b99fab50..b855e5774 100644
--- a/kate/data/clipper.xml
+++ b/kate/data/clipper.xml
@@ -408,22 +408,22 @@
 
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-        <RegExpr attribute="Keyword" context="#stay" String="\bfunction\b" insensitive="TRUE" beginRegion="regFunction" />
-        <RegExpr attribute="Keyword" context="#stay" String="^return\b" insensitive="TRUE" endRegion="regFunction" />
-	<RegExpr attribute="Keyword" context="#stay" String="\bbegin\s+sequence\b" insensitive="TRUE" beginRegion="regSequence" />
-	<RegExpr attribute="Keyword" context="#stay" String="\bend\s+sequence\b" insensitive="TRUE" endRegion="regSequence" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bdo\s+case\b" insensitive="TRUE" beginRegion="regDoCase" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bendcase\b" insensitive="TRUE" endRegion="regDoCase" />
-	<RegExpr attribute="Keyword" context="#stay" String="\bdo\s+while\b" insensitive="TRUE" beginRegion="regDoWhile" />
-	<RegExpr attribute="Keyword" context="#stay" String="\benddo\b" insensitive="TRUE" endRegion="regDoWhile" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bfor\b" insensitive="TRUE" beginRegion="regFor" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bnext\b" insensitive="TRUE" endRegion="regFor" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bif\b" insensitive="TRUE" beginRegion="regIf" />
-        <RegExpr attribute="Keyword" context="#stay" String="\belseif\b" insensitive="TRUE" endRegion="regIf" beginRegion="regIf" />
-	<RegExpr attribute="Keyword" context="#stay" String="\belse\b" insensitive="TRUE" endRegion="regIf" beginRegion="regIf" />
-        <RegExpr attribute="Keyword" context="#stay" String="\bendif\b" insensitive="TRUE" endRegion="regIf" />
-	<RegExpr attribute="Keyword" context="#stay" String="\bswitch\b" insensitive="TRUE" beginRegion="regSwitch" />
-	<RegExpr attribute="Keyword" context="#stay" String="\bendswitch\b" insensitive="TRUE" endRegion="regSwitch" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bfunction\b" insensitive="true" beginRegion="regFunction" />
+        <RegExpr attribute="Keyword" context="#stay" String="^return\b" insensitive="true" endRegion="regFunction" />
+	<RegExpr attribute="Keyword" context="#stay" String="\bbegin\s+sequence\b" insensitive="true" beginRegion="regSequence" />
+	<RegExpr attribute="Keyword" context="#stay" String="\bend\s+sequence\b" insensitive="true" endRegion="regSequence" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bdo\s+case\b" insensitive="true" beginRegion="regDoCase" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bendcase\b" insensitive="true" endRegion="regDoCase" />
+	<RegExpr attribute="Keyword" context="#stay" String="\bdo\s+while\b" insensitive="true" beginRegion="regDoWhile" />
+	<RegExpr attribute="Keyword" context="#stay" String="\benddo\b" insensitive="true" endRegion="regDoWhile" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bfor\b" insensitive="true" beginRegion="regFor" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bnext\b" insensitive="true" endRegion="regFor" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bif\b" insensitive="true" beginRegion="regIf" />
+        <RegExpr attribute="Keyword" context="#stay" String="\belseif\b" insensitive="true" endRegion="regIf" beginRegion="regIf" />
+	<RegExpr attribute="Keyword" context="#stay" String="\belse\b" insensitive="true" endRegion="regIf" beginRegion="regIf" />
+        <RegExpr attribute="Keyword" context="#stay" String="\bendif\b" insensitive="true" endRegion="regIf" />
+	<RegExpr attribute="Keyword" context="#stay" String="\bswitch\b" insensitive="true" beginRegion="regSwitch" />
+	<RegExpr attribute="Keyword" context="#stay" String="\bendswitch\b" insensitive="true" endRegion="regSwitch" />
         
 	<keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Command" context="#stay" String="commands"/>
diff --git a/kate/data/coldfusion.xml b/kate/data/coldfusion.xml
index 9e49e4af6..59f4be00c 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.04" kateversion="2.3" section="Markup" extensions="*.cfm;*.cfc;*.cfml;*.dbm" mimetype="text/x-coldfusion">
+<language name="ColdFusion" version="1.04" 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 09e70011b..b1197b508 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.1" section="Sources" extensions="*.cp;*.bro" mimetype="text/x-component-pascal" author="Werner Braun (wb@o3-software.de)" license="">
+<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="">
 	<highlighting>
 		<list name="keywords">
 			<item> BEGIN </item>
diff --git a/kate/data/crk.xml b/kate/data/crk.xml
index 2d83e3f25..e5e1a8435 100644
--- a/kate/data/crk.xml
+++ b/kate/data/crk.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Crack" version="1.1" kateversion="2.3" section="Sources" extensions="*.crk" mimetype="">
+<language name="Crack" version="1.1" kateversion="2.2" section="Sources" extensions="*.crk" mimetype="">
   <highlighting>
     <list name="keywords">
       <item> break</item>
@@ -50,14 +50,14 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <DetectChar attribute="String" context="Single quoted String" char="'"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
diff --git a/kate/data/cs.xml b/kate/data/cs.xml
index 260434c9b..29542c9bd 100644
--- a/kate/data/cs.xml
+++ b/kate/data/cs.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="C#" version="1.15" kateversion="2.3" section="Sources" extensions="*.cs" mimetype="text/x-csharp-src;text/x-csharp-hde">
+<language name="C#" version="1.15" kateversion="2.2" section="Sources" extensions="*.cs" mimetype="text/x-csharp-src;text/x-csharp-hde">
   <highlighting>
     <list name="keywords">
       <item> abstract</item>
@@ -100,14 +100,14 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
diff --git a/kate/data/css-php.xml b/kate/data/css-php.xml
index 6a8bf4d73..63d40ebf7 100644
--- a/kate/data/css-php.xml
+++ b/kate/data/css-php.xml
@@ -921,7 +921,7 @@ Changelog:
 					<DetectIdentifier/>
 				</context>
 
-			<context name="FindPHP">
+			<context name="FindPHP" attribute="Normal Text" lineEndContext="#stay">
 <RegExpr context="##PHP/PHP" String="&lt;\?(?:=|php)?" lookAhead="true" />
 </context>
 </contexts>
diff --git a/kate/data/cue.xml b/kate/data/cue.xml
index 6044aae7b..d8fb54514 100644
--- a/kate/data/cue.xml
+++ b/kate/data/cue.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="CUE Sheet" version="0.91" kateversion="2.1" section="Other" extensions="*.cue" mimetype="application/x-cue">
+<language name="CUE Sheet" version="0.91" kateversion="2.2" section="Other" extensions="*.cue" mimetype="application/x-cue">
   <highlighting>
     <list name="keywords">
       <item> CATALOG </item>
diff --git a/kate/data/diff.xml b/kate/data/diff.xml
index eb63a52bb..b681b4270 100644
--- a/kate/data/diff.xml
+++ b/kate/data/diff.xml
@@ -15,7 +15,7 @@
     2008-02-13: 1.11 Eduardo Robles Elvira <edulix AT gmail DOT com>
      Fixed folding.
 -->
-<language name="Diff" version="1.11" kateversion="2.1" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch">
+<language name="Diff" version="1.12" kateversion="2.4" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch">
 
   <highlighting>
 
@@ -25,7 +25,7 @@
         <RegExpr attribute="Header" context="Chunk" String="&chunk;" beginRegion="chunk" column="0"/>
         <RegExpr attribute="Header" context="RChunk" String="\*+$" beginRegion="chunk" column="0"/>
         <RegExpr attribute="File" context="#stay" String="Only in .*:.*$" column="0"/>
-        <RegExpr attribute="File" context="RFile" String="diff.*$" Region="chunk" column="0"/>
+        <RegExpr attribute="File" context="RFile" String="diff.*$" beginRegion="chunk" column="0"/>
         <RegExpr attribute="File" context="#stay" String="====.*$" column="0"/>
         <RegExpr attribute="File" context="File" String="(\*\*\*|\-\-\-).*$" beginRegion="chunk" column="0"/>
         <IncludeRules context="FindDiff"/>
diff --git a/kate/data/djangotemplate.xml b/kate/data/djangotemplate.xml
index 47ad9cd09..b790f8355 100644
--- a/kate/data/djangotemplate.xml
+++ b/kate/data/djangotemplate.xml
@@ -131,15 +131,15 @@
     <StringDetect attribute="CDATA" context="CDATA" String="&lt;![CDATA[" beginRegion="cdata" />
     <RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" beginRegion="doctype" />
     <RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:-]*" beginRegion="pi" />
-    <RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="TRUE" beginRegion="style" />
-    <RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="TRUE" beginRegion="script" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="TRUE" beginRegion="pre" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="TRUE" beginRegion="div" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="TRUE" beginRegion="table" />
+    <RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="true" beginRegion="style" />
+    <RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="true" beginRegion="script" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="true" beginRegion="pre" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="true" beginRegion="div" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="true" beginRegion="table" />
     <RegExpr attribute="Element" context="El Open" String="&lt;&name;" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="TRUE" endRegion="pre" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="TRUE" endRegion="div" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="TRUE" endRegion="table" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="true" endRegion="pre" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="true" endRegion="div" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="true" endRegion="table" />
     <RegExpr attribute="Element" context="El Close" String="&lt;/&name;" />
     <!-- as long as kde gives DTDs the text/html mimetype--><IncludeRules context="FindDTDRules" />
     <IncludeRules context="FindEntityRefs" />
@@ -248,7 +248,7 @@
   </context>
 
   <context name="CSS content" attribute="Normal Text" lineEndContext="#stay">
-    <RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="TRUE" endRegion="style" />
+    <RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="true" endRegion="style" />
     <IncludeRules context="FindTemplate" />
     <IncludeRules context="##CSS" includeAttrib="true"/>
   </context>
@@ -262,14 +262,14 @@
   </context>
 
   <context name="JS content" attribute="Normal Text" lineEndContext="#stay">
-    <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
-    <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
+    <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="true" endRegion="script" />
+    <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="true" />
     <IncludeRules context="FindTemplate" />
     <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
   </context>
 
   <context name="JS comment close" attribute="Comment" lineEndContext="#pop">
-    <RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
+    <RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="true" endRegion="script" />
     <IncludeRules context="FindTemplate" />
     <IncludeRules context="##Alerts" />
   </context>
diff --git a/kate/data/dockerfile.xml b/kate/data/dockerfile.xml
new file mode 100644
index 000000000..3e90ee24d
--- /dev/null
+++ b/kate/data/dockerfile.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!-- Dockerfile syntaxfile v1.0 by James Turnbull <james@lovedthanlost.net> -->
+<language name="Dockerfile" section="Other" version="1.1" kateversion="2.4" extensions="Dockerfile" author="James Turnbull (james@lovedthanlost.net)" license="LGPLv2+">
+  <highlighting>
+    <list name="keywords">
+      <item> FROM </item>
+      <item> MAINTAINER </item>
+      <item> ENV </item>
+      <item> RUN </item>
+      <item> ONBUILD </item>
+      <item> COPY </item>
+      <item> ADD </item>
+      <item> VOLUME </item>
+      <item> EXPOSE </item>
+      <item> ENTRYPOINT </item>
+      <item> CMD </item>
+      <item> WORKDIR </item>
+      <item> USER </item>
+    </list>
+
+    <contexts>
+      <context name="normal" attribute="Normal" lineEndContext="#stay">
+        <DetectSpaces/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
+        <keyword attribute="Keyword"  context="#stay" String="keywords"/>
+        <DetectIdentifier/>
+        <DetectChar attribute="String" context="string&quot;" char="&quot;"/>
+        <DetectChar attribute="String" context="string'" char="'"/>
+      </context>
+
+      <context attribute="Comment" lineEndContext="#pop" name="Comment">
+        <LineContinue attribute="Comment" context="#stay" />
+      </context>
+
+      <context name="string&quot;" attribute="String" lineEndContext="#pop">
+        <LineContinue attribute="Operator" context="#stay"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+
+      <context name="string'" attribute="String" lineEndContext="#pop">
+        <LineContinue attribute="String" context="#stay"/>
+        <DetectChar attribute="String" context="#pop" char="'"/>
+      </context>
+
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal"    defStyleNum="dsNormal" spellChecking="0"/>
+      <itemData name="Keyword"   defStyleNum="dsKeyword" spellChecking="0"/>
+      <itemData name="Comment"   defStyleNum="dsComment"/>
+      <itemData name="String"    defStyleNum="dsString" spellChecking="0"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name = "singleLine" start = "#"/>
+    </comments>
+  </general>
+</language>
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
+
diff --git a/kate/data/dot.xml b/kate/data/dot.xml
index 5b0e66389..399acb059 100644
--- a/kate/data/dot.xml
+++ b/kate/data/dot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Adapted from the VIM highlighter, by Markus Mottl (markus@oefai.at) -->
-<language name="dot" version="1.1" kateversion="2.4" section="Scientific" extensions="*.dot" mimetype="text/x-dot" author="Postula Loïs (lois.postula@live.be)" priority="0">
+<language name="dot" version="1.1" kateversion="2.3" section="Scientific" extensions="*.dot" mimetype="text/x-dot" author="Postula Loïs (lois.postula@live.be)" priority="0">
 
   <highlighting>
 
diff --git a/kate/data/doxygen.xml b/kate/data/doxygen.xml
index 8854ecbc4..302eeae8f 100644
--- a/kate/data/doxygen.xml
+++ b/kate/data/doxygen.xml
@@ -29,8 +29,8 @@
  -->
 
 <language name="Doxygen"
-          version="1.36-1"
-          kateversion="2.5"
+          version="1.38-1"
+          kateversion="2.4"
           section="Markup"
           extensions="*.dox;*.doxygen"
           mimetype="text/x-doxygen"
@@ -149,7 +149,7 @@
       <item> \extends </item>          <item> @extends </item>
       <item> \file </item>             <item> @file </item>
       <item> \htmlinclude </item>      <item> @htmlinclude </item>
-      <item> \idlexcept </item>m>      <item> @idlexcept </item>
+      <item> \idlexcept </item>        <item> @idlexcept </item>
       <item> \if </item>               <item> @if </item>
       <item> \ifnot </item>            <item> @ifnot </item>
       <item> \implements </item>       <item> @implements </item>
@@ -293,7 +293,7 @@
         <keyword attribute="Tags" context="ML_TagWordWord" String="TagWordWord" />
         <keyword attribute="Tags" context="ML_TagString" String="TagString" />
         <keyword attribute="Tags" context="ML_TagWordString" String="TagWordString" />
-        <RegExpr attribute="Custom Tags" context="#stay" String="[@\\][^@\\ \t]+" />
+        <RegExpr attribute="Custom Tags" context="#stay" String="[@\\]([^@\\ \t\*]|\*(?!/))+" />
         <DetectIdentifier />
         <RegExpr attribute="Tags" context="#stay" String="\\(&lt;|&gt;)" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
diff --git a/kate/data/e.xml b/kate/data/e.xml
index c21ac2880..12d8d2544 100644
--- a/kate/data/e.xml
+++ b/kate/data/e.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="E Language" version="0.22" kateversion="2.3" section="Sources" extensions="*.e" mimetype="text/x-e-src">
+<language name="E Language" version="0.22" kateversion="2.2" section="Sources" extensions="*.e" mimetype="text/x-e-src">
     <highlighting>
         <list name="Type">
             <item> FALSE </item>
diff --git a/kate/data/eiffel.xml b/kate/data/eiffel.xml
index 9998fd824..023afdea5 100644
--- a/kate/data/eiffel.xml
+++ b/kate/data/eiffel.xml
@@ -10,7 +10,7 @@ Change log:
 
 Author of version 1.02: Sebastian Vuorinen
 -->
-<language name="Eiffel" version="1.02" kateversion="2.1" section="Sources" extensions="*.e" mimetype="text/x-eiffel-src" author="Sebastian Vuorinen" license="">
+<language name="Eiffel" version="1.02" kateversion="2.3" section="Sources" extensions="*.e" mimetype="text/x-eiffel-src" author="Sebastian Vuorinen" license="">
 	<highlighting>
 		<list name="keywords">
 			<item> agent </item>
diff --git a/kate/data/email.xml b/kate/data/email.xml
index a3ef294f2..ca5513e2c 100644
--- a/kate/data/email.xml
+++ b/kate/data/email.xml
@@ -3,10 +3,10 @@
 <!--
   Copyright (C) 2005 Carl A Joslin <carl.joslin@joslin.dyndns.org>
 -->
-<language name="Email" version="1.00" kateversion="2.4" extensions="*.eml" section="Other" mimetype="message/rfc822" casesensitive="0" author="Carl A Joslin (carl.joslin@joslin.dyndns.org)" license="GPL">
+<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">
   <highlighting>
     <contexts>      
-      <context name="headder" attribute="Normal Text" lineEndContext="#stay" casesensitive="0">
+      <context name="headder" attribute="Normal Text" lineEndContext="#stay">
         <RegExpr attribute="rfc-main" context="#stay" String="^[Tt]o:.*$"/>
         <RegExpr attribute="rfc-main" context="#stay" String="^[Ff]rom:.*$"/>
         <RegExpr attribute="rfc-main" context="#stay" String="^[Cc][Cc]:.*$"/>
@@ -79,22 +79,22 @@
     </contexts>
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal"/>
-      <itemData name="rfc" color="darkgreen"/>
+      <itemData name="rfc" color="darkgreen" defStyleNum="dsNormal"/>
       <itemData name="rfc-main" bold="1" color="darkgreen" defStyleNum="dsAlert"/>
-      <itemData name="common" color="gold"/>
-      <itemData name="other" color="red"/>
-      <itemData name="email" color="blue"/>
+      <itemData name="common" color="gold" defStyleNum="dsComment"/>
+      <itemData name="other" color="red" defStyleNum="dsNormal"/>
+      <itemData name="email" color="blue" defStyleNum="dsNormal"/>
       <itemData name="string" defStyleNum="dsString"/>
       
       <itemData name="base64" defStyleNum="dsRegionMarker"/>
       <itemData name="marker" defStyleNum="dsAlert"/>
       
-      <itemData name="indent1" bold="1" color="red"/>
-      <itemData name="indent2" bold="1" color="green"/>
-      <itemData name="indent3" bold="1" color="blue"/>
-      <itemData name="indent4" bold="1" color="cyan"/>
-      <itemData name="indent5" bold="1" color="magenta"/>
-      <itemData name="indent6" bold="1" color="yellow"/>
+      <itemData name="indent1" bold="1" color="red" defStyleNum="dsNormal"/>
+      <itemData name="indent2" bold="1" color="green" defStyleNum="dsNormal"/>
+      <itemData name="indent3" bold="1" color="blue" defStyleNum="dsNormal"/>
+      <itemData name="indent4" bold="1" color="cyan" defStyleNum="dsNormal"/>
+      <itemData name="indent5" bold="1" color="magenta" defStyleNum="dsNormal"/>
+      <itemData name="indent6" bold="1" color="yellow" defStyleNum="dsNormal"/>
       
       
       <itemData name="sign" defStyleNum="dsComment"/>
diff --git a/kate/data/erlang.xml b/kate/data/erlang.xml
index 8cbec0156..f26e45a3c 100644
--- a/kate/data/erlang.xml
+++ b/kate/data/erlang.xml
@@ -36,7 +36,7 @@
                                    - fixed highlighting problem when '@' at end of atom/variable
 -->
 
-<language name="Erlang" version="1.03" kateversion="2.5" section="Scripts" extensions="*.erl" mimetype="" author="Bill Ross (bill@emailme.net.au)" license="LGPL">
+<language name="Erlang" version="1.03" kateversion="2.4" section="Scripts" extensions="*.erl" mimetype="" author="Bill Ross (bill@emailme.net.au)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <!-- ====== s3.8 p 24 of erlang spec ===== -->
diff --git a/kate/data/fasm.xml b/kate/data/fasm.xml
new file mode 100644
index 000000000..64734ce01
--- /dev/null
+++ b/kate/data/fasm.xml
@@ -0,0 +1,899 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+"Intel x86 (FASM)" is based on ver. 1.3 of "Intel x86 (NASM)" by Nicola Gigante and Bogdan Drozdowski
+
+Known issues:
+* Does not include all 64-bit registers and instructions
+* "near" and "far" as in "jmp near MyLabel" is unhandeled.
+* Confuses and,or,not,xor,shl instructions,with operators with same name, e.g. "2 shl 4"
+* May confuse ah,bh,ch,dh with hexadecimal numbers.
+
+Notes:
+* "used" and "defined" are treated opperators and are not highlighted.
+-->
+
+<language name="Intel x86 (FASM)" section="Assembler" version="0.2" kateversion="2.3" extensions="*.asm;*.inc;*.fasm" mimetype="" author="rCX (rCX12@yahoo.com)" license="GPL">
+  <highlighting>
+    <list name="registers">
+      <!-- General purpose registers -->
+      <item>rax</item>
+      <item>eax</item>
+      <item>ax</item>
+      <item>ah</item>
+      <item>al</item>
+      <item>rbx</item>
+      <item>ebx</item>
+      <item>bx</item>
+      <item>bh</item>
+      <item>bl</item>
+      <item>rcx</item>
+      <item>ecx</item>
+      <item>cx</item>
+      <item>ch</item>
+      <item>cl</item>
+      <item>rdx</item>
+      <item>edx</item>
+      <item>dx</item>
+      <item>dh</item>
+      <item>dl</item>
+      <item>rbp</item>
+      <item>ebp</item>
+      <item>bp</item>
+      <item>rsi</item>
+      <item>esi</item>
+      <item>si</item>
+      <item>rdi</item>
+      <item>edi</item>
+      <item>di</item>
+      <item>rsp</item>
+      <item>esp</item>
+      <item>sp</item>
+      <item>r8</item>
+      <item>r9</item>
+      <item>r10</item>
+      <item>r11</item>
+      <item>r12</item>
+      <item>r13</item>
+      <item>r14</item>
+      <item>r15</item>
+      <!-- Segmentation registers -->
+      <item>cs</item>
+      <item>ds</item>
+      <item>es</item>
+      <item>fs</item>
+      <item>gs</item>
+      <item>ss</item>
+      <!-- Control registers -->
+      <item>cr0</item>
+      <!--<item>cr1</item>-->
+      <item>cr2</item>
+      <item>cr3</item>
+      <item>cr4</item>
+      <!-- Debug registers -->
+      <item>dr0</item>
+      <item>dr1</item>
+      <item>dr2</item>
+      <item>dr3</item>
+      <item>dr6</item>
+      <item>dr7</item>
+      <!-- x87 FPU Registers -->
+      <item>st</item>
+      <!-- MMX registers -->
+      <item>mm0</item>
+      <item>mm1</item>
+      <item>mm2</item>
+      <item>mm3</item>
+      <item>mm4</item>
+      <item>mm5</item>
+      <item>mm6</item>
+      <item>mm7</item>
+      <!-- XMM registers -->
+      <item>xmm0</item>
+      <item>xmm1</item>
+      <item>xmm2</item>
+      <item>xmm3</item>
+      <item>xmm4</item>
+      <item>xmm5</item>
+      <item>xmm6</item>
+      <item>xmm7</item>
+    </list>
+    <list name="instructions">
+      <item>aaa</item>
+      <item>aad</item>
+      <item>aam</item>
+      <item>aas</item>
+      <item>adc</item>
+      <item>add</item>
+      <item>addpd</item>
+      <item>addps</item>
+      <item>addsd</item>
+      <item>addss</item>
+      <item>addsubpd</item>
+      <item>addsubps</item>
+      <item>and</item>
+      <item>andnpd</item>
+      <item>andnps</item>
+      <item>andpd</item>
+      <item>andps</item>
+      <item>arpl</item>
+      <item>bound</item>
+      <item>bsf</item>
+      <item>bsr</item>
+      <item>bswap</item>
+      <item>bt</item>
+      <item>btc</item>
+      <item>btr</item>
+      <item>bts</item>
+      <item>call</item>
+      <item>cbw</item>
+      <item>cwde</item>
+      <item>cwd</item>
+      <item>cdq</item>
+      <item>cdqe</item>
+      <item>cqo</item>
+      <item>clc</item>
+      <item>cld</item>
+      <item>clgi</item>
+      <item>cli</item>
+      <item>clts</item>
+      <item>clflush</item>
+      <item>cmc</item>
+      <item>cmova</item>
+      <item>cmovae</item>
+      <item>cmovb</item>
+      <item>cmovbe</item>
+      <item>cmovc</item>
+      <item>cmove</item>
+      <item>cmovg</item>
+      <item>cmovge</item>
+      <item>cmovl</item>
+      <item>cmovle</item>
+      <item>cmovna</item>
+      <item>cmovnae</item>
+      <item>cmovnb</item>
+      <item>cmovnbe</item>
+      <item>cmovnc</item>
+      <item>cmovne</item>
+      <item>cmovng</item>
+      <item>cmovnge</item>
+      <item>cmovnl</item>
+      <item>cmovnle</item>
+      <item>cmovno</item>
+      <item>cmovnp</item>
+      <item>cmovns</item>
+      <item>cmovnz</item>
+      <item>cmovo</item>
+      <item>cmovp</item>
+      <item>cmovpe</item>
+      <item>cmovpo</item>
+      <item>cmovs</item>
+      <item>cmovz</item>
+      <item>cmp</item>
+      <item>cmpeqpd</item>
+      <item>cmpeqps</item>
+      <item>cmpeqsd</item>
+      <item>cmpeqss</item>
+      <item>cmplepd</item>
+      <item>cmpleps</item>
+      <item>cmplesd</item>
+      <item>cmpless</item>
+      <item>cmpltpd</item>
+      <item>cmpltps</item>
+      <item>cmpltsd</item>
+      <item>cmpltss</item>
+      <item>cmpneqpd</item>
+      <item>cmpneqps</item>
+      <item>cmpneqsd</item>
+      <item>cmpneqss</item>
+      <item>cmpnlepd</item>
+      <item>cmpnleps</item>
+      <item>cmpnlesd</item>
+      <item>cmpnless</item>
+      <item>cmpnltpd</item>
+      <item>cmpnltps</item>
+      <item>cmpnltsd</item>
+      <item>cmpnltss</item>
+      <item>cmpordpd</item>
+      <item>cmpordps</item>
+      <item>cmpordsd</item>
+      <item>cmpordss</item>
+      <item>cmppd</item>
+      <item>cmpps</item>
+      <item>cmps</item>
+      <item>cmpsb</item>
+      <item>cmpsd</item>
+      <item>cmpss</item>
+      <item>cmpsw</item>
+      <item>cmpunordpd</item>
+      <item>cmpunordps</item>
+      <item>cmpunordsd</item>
+      <item>cmpunordss</item>
+      <item>cmpxchg</item>
+      <item>cmpxchg486</item>
+      <item>cmpxchg8b</item>
+      <item>cmpxchg16b</item>
+      <item>comisd</item>
+      <item>comiss</item>
+      <item>cpuid</item>
+      <item>cvtdq2pd</item>
+      <item>cvtdq2ps</item>
+      <item>cvtpd2dq</item>
+      <item>cvtpd2pi</item>
+      <item>cvtpd2ps</item>
+      <item>cvtpi2pd</item>
+      <item>cvtpi2ps</item>
+      <item>cvtps2dq</item>
+      <item>cvtps2pd</item>
+      <item>cvtps2pi</item>
+      <item>cvtsd2si</item>
+      <item>cvtsd2ss</item>
+      <item>cvtsi2sd</item>
+      <item>cvtsi2ss</item>
+      <item>cvtss2sd</item>
+      <item>cvtss2si</item>
+      <item>cvttpd2dq</item>
+      <item>cvttpd2pi</item>
+      <item>cvttps2dq</item>
+      <item>cvttps2pi</item>
+      <item>cvttsd2si</item>
+      <item>cvttss2si</item>
+      <item>daa</item>
+      <item>das</item>
+      <item>dec</item>
+      <item>div</item>
+      <item>divpd</item>
+      <item>divps</item>
+      <item>divsd</item>
+      <item>divss</item>
+      <item>emms</item>
+      <item>enter</item>
+      <item>f2xm1</item>
+      <item>fabs</item>
+      <item>fadd</item>
+      <item>faddp</item>
+      <item>fbld</item>
+      <item>fbstp</item>
+      <item>fchs</item>
+      <item>fclex</item>
+      <item>fnclex</item>
+      <item>fcmovb</item>
+      <item>fcmovbe</item>
+      <item>fcmove</item>
+      <item>fcmovnb</item>
+      <item>fcmovnbe</item>
+      <item>fcmovne</item>
+      <item>fcmovnu</item>
+      <item>fcmovu</item>
+      <item>fcom</item>
+      <item>fcomp</item>
+      <item>fcompp</item>
+      <item>fcomi</item>
+      <item>fcomip</item>
+      <item>fcos</item>
+      <item>fdecstp</item>
+      <item>fdisi</item>
+      <item>feni</item>
+      <item>fdiv</item>
+      <item>fdivr</item>
+      <item>fdivp</item>
+      <item>fdivrp</item>
+      <item>femms</item>
+      <item>ffree</item>
+      <item>ffreep</item>
+      <item>fiadd</item>
+      <item>ficom</item>
+      <item>ficomp</item>
+      <item>fidiv</item>
+      <item>fidivr</item>
+      <item>fild</item>
+      <item>fimul</item>
+      <item>fincstp</item>
+      <item>finit</item>
+      <item>fist</item>
+      <item>fistp</item>
+      <item>fisttp</item>
+      <item>fisub</item>
+      <item>fisubr</item>
+      <item>fld</item>
+      <item>fld1</item>
+      <item>fldl2e</item>
+      <item>fldl2t</item>
+      <item>fldlg2</item>
+      <item>fldln2</item>
+      <item>fldcw</item>
+      <item>fldenv</item>
+      <item>fldpi</item>
+      <item>fldz</item>
+      <item>fmul</item>
+      <item>fmulp</item>
+      <item>fndisi</item>
+      <item>fneni</item>
+      <item>fninit</item>
+      <item>fnop</item>
+      <item>fnsave</item>
+      <item>fnstcw</item>
+      <item>fnstenv</item>
+      <item>fnstsw</item>
+      <item>fnwait</item>
+      <item>fpatan</item>
+      <item>fptan</item>
+      <item>fprem</item>
+      <item>fprem1</item>
+      <item>frndint</item>
+      <item>frstor</item>
+      <item>fsave</item>
+      <item>fscale</item>
+      <item>fsetpm</item>
+      <item>fsin</item>
+      <item>fsincos</item>
+      <item>fsqrt</item>
+      <item>fst</item>
+      <item>fstp</item>
+      <item>fstcw</item>
+      <item>fstenv</item>
+      <item>fstsw</item>
+      <item>fsub</item>
+      <item>fsubr</item>
+      <item>fsubp</item>
+      <item>fsubrp</item>
+      <item>ftst</item>
+      <item>fucom</item>
+      <item>fucomp</item>
+      <item>fucompp</item>
+      <item>fucomi</item>
+      <item>fucomip</item>
+      <item>fwait</item>
+      <item>fxam</item>
+      <item>fxch</item>
+      <item>fxrstor</item>
+      <item>fxsave</item>
+      <item>fxtract</item>
+      <item>fyl2x</item>
+      <item>fyl2xp1</item>
+      <item>haddpd</item>
+      <item>haddps</item>
+      <item>hlt</item>
+      <item>hsubpd</item>
+      <item>hsubps</item>
+      <item>ibts</item>
+      <item>idiv</item>
+      <item>imul</item>
+      <item>in</item>
+      <item>inc</item>
+      <item>ins</item>
+      <item>insb</item>
+      <item>insd</item>
+      <item>insw</item>
+      <item>int</item>
+      <item>int1</item>
+      <item>int3</item>
+      <item>into</item>
+      <item>invd</item>
+      <item>invlpg</item>
+      <item>invlpga</item>
+      <item>iret</item>
+      <item>iretd</item>
+      <item>iretq</item>
+      <item>iretw</item>
+      <item>ja</item>
+      <item>jae</item>
+      <item>jb</item>
+      <item>jbe</item>
+      <item>jc</item>
+      <item>je</item>
+      <item>jg</item>
+      <item>jge</item>
+      <item>jl</item>
+      <item>jle</item>
+      <item>jna</item>
+      <item>jnae</item>
+      <item>jnb</item>
+      <item>jnbe</item>
+      <item>jnc</item>
+      <item>jne</item>
+      <item>jng</item>
+      <item>jnge</item>
+      <item>jnl</item>
+      <item>jnle</item>
+      <item>jno</item>
+      <item>jnp</item>
+      <item>jns</item>
+      <item>jnz</item>
+      <item>jo</item>
+      <item>jp</item>
+      <item>jpe</item>
+      <item>jpo</item>
+      <item>js</item>
+      <item>jz</item>
+      <item>jcxz</item>
+      <item>jecxz</item>
+      <item>jrcxz</item>
+      <item>jmp</item>
+      <item>lahf</item>
+      <item>lar</item>
+      <item>lddqu</item>
+      <item>ldmxcsr</item>
+      <item>lds</item>
+      <item>les</item>
+      <item>lea</item>
+      <item>leave</item>
+      <item>lfence</item>
+      <item>lfs</item>
+      <item>lgdt</item>
+      <item>lgs</item>
+      <item>lidt</item>
+      <item>lldt</item>
+      <item>lmsw</item>
+      <item>loadall</item>
+      <item>loadall286</item>
+      <item>lods</item>
+      <item>lodsb</item>
+      <item>lodsd</item>
+      <item>lodsq</item>
+      <item>lodsw</item>
+      <item>loop</item>
+      <item>loope</item>
+      <item>loopne</item>
+      <item>loopnz</item>
+      <item>loopz</item>
+      <item>lsl</item>
+      <item>lss</item>
+      <item>ltr</item>
+      <item>maskmovdqu</item>
+      <item>maskmovq</item>
+      <item>maxpd</item>
+      <item>maxps</item>
+      <item>maxsd</item>
+      <item>maxss</item>
+      <item>mfence</item>
+      <item>minpd</item>
+      <item>minps</item>
+      <item>minsd</item>
+      <item>minss</item>
+      <item>monitor</item>
+      <item>mov</item>
+      <item>movapd</item>
+      <item>movaps</item>
+      <item>movd</item>
+      <item>movddup</item>
+      <item>movdq2q</item>
+      <item>movdqa</item>
+      <item>movdqu</item>
+      <item>movhlps</item>
+      <item>movhpd</item>
+      <item>movhps</item>
+      <item>movlhps</item>
+      <item>movlpd</item>
+      <item>movlps</item>
+      <item>movmskpd</item>
+      <item>movmskps</item>
+      <item>movntdq</item>
+      <item>movnti</item>
+      <item>movntpd</item>
+      <item>movntps</item>
+      <item>movntq</item>
+      <item>movq</item>
+      <item>movq2dq</item>
+      <item>movs</item>
+      <item>movsb</item>
+      <item>movsd</item>
+      <item>movshdup</item>
+      <item>movsldup</item>
+      <item>movsq</item>
+      <item>movss</item>
+      <item>movsx</item>
+      <item>movsxd</item>
+      <item>movsw</item>
+      <item>movupd</item>
+      <item>movups</item>
+      <item>movzx</item>
+      <item>mul</item>
+      <item>mulpd</item>
+      <item>mulps</item>
+      <item>mulsd</item>
+      <item>mulss</item>
+      <item>mwait</item>
+      <item>neg</item>
+      <item>nop</item>
+      <item>not</item>
+      <item>or</item>
+      <item>orpd</item>
+      <item>orps</item>
+      <item>out</item>
+      <item>outs</item>
+      <item>outsb</item>
+      <item>outsw</item>
+      <item>outsd</item>
+      <item>packssdw</item>
+      <item>packsswb</item>
+      <item>packuswb</item>
+      <item>paddb</item>
+      <item>paddd</item>
+      <item>paddq</item>
+      <item>paddsb</item>
+      <item>paddsw</item>
+      <item>paddusb</item>
+      <item>paddusw</item>
+      <item>paddw</item>
+      <item>pand</item>
+      <item>pandn</item>
+      <item>pause</item>
+      <item>pavgb</item>
+      <item>pavgusb</item>
+      <item>pavgw</item>
+      <item>pcmpeqb</item>
+      <item>pcmpeqw</item>
+      <item>pcmpeqd</item>
+      <item>pcmpgtb</item>
+      <item>pcmpgtw</item>
+      <item>pcmpgtd</item>
+      <item>pdistib</item>
+      <item>pextrw</item>
+      <item>pf2id</item>
+      <item>pf2iw</item>
+      <item>pfacc</item>
+      <item>pfadd</item>
+      <item>pfcmpeq</item>
+      <item>pfcmpge</item>
+      <item>pfcmpgt</item>
+      <item>pfmax</item>
+      <item>pfmin</item>
+      <item>pfmul</item>
+      <item>pfnacc</item>
+      <item>pfpnacc</item>
+      <item>pfrcp</item>
+      <item>pfrcpit1</item>
+      <item>pfrcpit2</item>
+      <item>pfrsqit1</item>
+      <item>pfrsqrt</item>
+      <item>pfsub</item>
+      <item>pfsubr</item>
+      <item>pi2fd</item>
+      <item>pi2fw</item>
+      <item>pinsrw</item>
+      <item>pmachriw</item>
+      <item>pmaddwd</item>
+      <item>pmagw</item>
+      <item>pmaxsw</item>
+      <item>pmaxub</item>
+      <item>pminsw</item>
+      <item>pminub</item>
+      <item>pmovmskb</item>
+      <item>pmulhrw</item>
+      <item>pmulhuw</item>
+      <item>pmulhw</item>
+      <item>pmullw</item>
+      <item>pmuludq</item>
+      <item>pmvgezb</item>
+      <item>pmvlzb</item>
+      <item>pmvnzb</item>
+      <item>pmvzb</item>
+      <item>pop</item>
+      <item>popa</item>
+      <item>popaw</item>
+      <item>popad</item>
+      <item>popf</item>
+      <item>popfw</item>
+      <item>popfd</item>
+      <item>popfq</item>
+      <item>por</item>
+      <item>prefetch</item>
+      <item>prefetchnta</item>
+      <item>prefetcht0</item>
+      <item>prefetcht1</item>
+      <item>prefetcht2</item>
+      <item>prefetchw</item>
+      <item>psadbw</item>
+      <item>pshufd</item>
+      <item>pshufhw</item>
+      <item>pshuflw</item>
+      <item>pshufw</item>
+      <item>pslld</item>
+      <item>pslldq</item>
+      <item>psllq</item>
+      <item>psllw</item>
+      <item>psrad</item>
+      <item>psraw</item>
+      <item>psrld</item>
+      <item>psrldq</item>
+      <item>psrlq</item>
+      <item>psrlw</item>
+      <item>psubb</item>
+      <item>psubd</item>
+      <item>psubq</item>
+      <item>psubsb</item>
+      <item>psubsiw</item>
+      <item>psubsw</item>
+      <item>psubusb</item>
+      <item>psubusw</item>
+      <item>psubw</item>
+      <item>pswapd</item>
+      <item>punpckhbw</item>
+      <item>punpckhdq</item>
+      <item>punpckhqdq</item>
+      <item>punpckhwd</item>
+      <item>punpcklbw</item>
+      <item>punpckldq</item>
+      <item>punpcklqdq</item>
+      <item>punpcklwd</item>
+      <item>push</item>
+      <item>pusha</item>
+      <item>pushad</item>
+      <item>pushaw</item>
+      <item>pushf</item>
+      <item>pushfd</item>
+      <item>pushfq</item>
+      <item>pushfw</item>
+      <item>pxor</item>
+      <item>rcl</item>
+      <item>rcr</item>
+      <item>rcpps</item>
+      <item>rcpss</item>
+      <item>rdmsr</item>
+      <item>rdpmc</item>
+      <item>rdshr</item>
+      <item>rdtsc</item>
+      <item>rdtscp</item>
+      <item>ret</item>
+      <item>retf</item>
+      <item>retn</item>
+      <item>rol</item>
+      <item>ror</item>
+      <item>rsdc</item>
+      <item>rsldt</item>
+      <item>rsm</item>
+      <item>rsqrtps</item>
+      <item>rsqrtss</item>
+      <item>rsts</item>
+      <item>sahf</item>
+      <item>sal</item>
+      <item>sar</item>
+      <item>salc</item>
+      <item>sbb</item>
+      <item>scas</item>
+      <item>scasb</item>
+      <item>scasd</item>
+      <item>scasq</item>
+      <item>scasw</item>
+      <item>seta</item>
+      <item>setae</item>
+      <item>setb</item>
+      <item>setbe</item>
+      <item>setc</item>
+      <item>sete</item>
+      <item>setg</item>
+      <item>setge</item>
+      <item>setl</item>
+      <item>setle</item>
+      <item>setna</item>
+      <item>setnae</item>
+      <item>setnb</item>
+      <item>setnbe</item>
+      <item>setnc</item>
+      <item>setne</item>
+      <item>setng</item>
+      <item>setnge</item>
+      <item>setnl</item>
+      <item>setnle</item>
+      <item>setno</item>
+      <item>setnp</item>
+      <item>setns</item>
+      <item>setnz</item>
+      <item>seto</item>
+      <item>setp</item>
+      <item>setpe</item>
+      <item>setpo</item>
+      <item>sets</item>
+      <item>setz</item>
+      <item>sfence</item>
+      <item>sgdt</item>
+      <item>shl</item>
+      <item>shld</item>
+      <item>shr</item>
+      <item>shrd</item>
+      <item>shufpd</item>
+      <item>shufps</item>
+      <item>sidt</item>
+      <item>skinit</item>
+      <item>sldt</item>
+      <item>smi</item>
+      <item>smint</item>
+      <item>smintold</item>
+      <item>smsw</item>
+      <item>sqrtpd</item>
+      <item>sqrtps</item>
+      <item>sqrtsd</item>
+      <item>sqrtss</item>
+      <item>stc</item>
+      <item>std</item>
+      <item>stgi</item>
+      <item>sti</item>
+      <item>stmxcsr</item>
+      <item>stos</item>
+      <item>stosb</item>
+      <item>stosd</item>
+      <item>stosq</item>
+      <item>stosw</item>
+      <item>str</item>
+      <item>sub</item>
+      <item>subpd</item>
+      <item>subps</item>
+      <item>subsd</item>
+      <item>subss</item>
+      <item>svdc</item>
+      <item>svldt</item>
+      <item>svts</item>
+      <item>swapgs</item>
+      <item>syscall</item>
+      <item>sysenter</item>
+      <item>sysexit</item>
+      <item>sysret</item>
+      <item>test</item>
+      <item>ucomisd</item>
+      <item>ucomiss</item>
+      <item>ud0</item>
+      <item>ud1</item>
+      <item>ud2</item>
+      <item>umov</item>
+      <item>unpckhpd</item>
+      <item>unpckhps</item>
+      <item>unpcklpd</item>
+      <item>unpcklps</item>
+      <item>verr</item>
+      <item>verw</item>
+      <item>vmload</item>
+      <item>vmmcall</item>
+      <item>vmrun</item>
+      <item>vmsave</item>
+      <item>wait</item>
+      <item>wbinvd</item>
+      <item>wrmsr</item>
+      <item>wrshr</item>
+      <item>xadd</item>
+      <item>xbts</item>
+      <item>xchg</item>
+      <item>xlat</item>
+      <item>xlatb</item>
+      <item>xor</item>
+      <item>xorpd</item>
+      <item>xorps</item>
+    </list>
+
+    <list name="Data">
+      <!-- Initialized data (1.2.2)-->
+      <item>db</item>
+      <item>dw</item>
+      <item>du</item>
+      <item>dd</item>
+      <item>dp</item>
+      <item>df</item>
+      <item>dq</item>
+      <item>dt</item>
+      <!-- Uninitialized data (1.2.2)-->
+      <item>rb</item>
+      <item>rw</item>
+      <item>rd</item>
+      <item>rp</item>
+      <item>rf</item>
+      <item>rq</item>
+      <item>rt</item>
+      <!-- binary file include (1.2.2)-->
+      <item>file</item>
+      <!-- operand size from (1.2.1)-->
+      <item>byte</item>
+      <item>word</item>
+      <item>dword</item>
+      <item>pword</item>
+      <item>qword</item>
+      <item>tbyte</item>
+      <item>tword</item>
+      <item>dqword</item>
+      <item>ptr</item>
+    </list>
+
+    <list name="Preprocessor Keywords"> <!-- Contains keywords for macros, structures, etc... -->
+      <item>append</item>
+      <item>at</item>   <!-- As in "virtual at"-->
+      <item>break</item>
+      <item>common</item>
+      <item>display</item>
+      <item>else</item>
+      <item>end</item> <!-- As in "end if"-->
+      <item>equ</item>
+      <item>fix</item>
+      <item>foward</item>
+      <item>if</item>
+      <item>irp</item>
+      <item>irps</item>
+      <item>label</item>
+      <item>local</item>
+      <item>match</item>
+      <item>macro</item>
+      <item>purge</item>
+      <item>repeat</item>
+      <item>rept</item>
+      <item>reverse</item>
+      <item>restore</item>
+      <item>struc</item>
+      <item>times</item>
+      <item>while</item>
+      <item>virtual</item>
+    </list>
+
+    <list name="Instruction-like Keywords"> <!-- Contains instruction-like keywords -->
+      <item>align</item>
+      <item>entry</item>
+      <item>extrn</item>
+      <item>format</item>
+      <item>include</item>
+      <item>invoke</item>
+      <item>data</item>
+      <item>load</item>
+      <item>from</item>
+      <item>heap</item>
+      <item>org</item>
+      <item>proc</item>
+      <item>public</item>
+      <item>section</item>
+      <item>segment</item>
+      <item>stack</item>
+      <item>store</item>
+      <item>use16</item>
+      <item>use32</item>
+      <item>use64</item>
+    </list>
+
+    <contexts>
+      <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+        <keyword attribute="Registers" context="#stay" String="registers"/>
+        <keyword attribute="Data" context="#stay" String="Data"/>
+        <keyword attribute="Instructions" context="#stay" String="instructions"/>
+        <keyword attribute="Instructions" context="#stay" String="Instruction-like Keywords"/>
+        <keyword attribute="Preprocessor" context="#stay" String="Preprocessor Keywords"/>
+        <DetectChar attribute="Comment" context="Comment" char=";"/>
+        <AnyChar attribute="String" context="String" String="&quot;'"/>
+        <RegExpr attribute="Label" context="#stay" String="^\s*[A-Za-z0-9@_.$?]+:"/>
+        <!-- Conditional instructions -->
+        <RegExpr attribute="Instructions" context="#stay" String="(cmov|fcmov|j|loop|set)(a|ae|b|be|c|e|g|ge|l|le|na|nae|nb|nbe|nc|ne|ng|nge|nl|nle|no|np|ns|nz|o|p|pe|po|s|z)"/>
+        <!-- hexadecimal numbers -->
+        <RegExpr attribute="BaseN" context="#stay" insensitive="true" String="(^|[ \t,]+)((\$|0x){1}[0-9]+[a-f0-9]*|[a-f0-9]+h)([ \t,]+|$)"/>
+        <!-- octal and binary numbers -->
+        <RegExpr attribute="BaseN" context="#stay" insensitive="true" String="(^|[ \t,]+)([0-7]+(q|o)|[01]+b)([ \t,]+|$)"/>
+        <DetectChar attribute="Number" context="#stay" char="$"/>
+        <HlCOct attribute="BaseN" context="#stay"/>
+        <HlCHex attribute="BaseN" context="#stay"/>
+        <Float attribute="Float" context="#stay"/>
+        <Int attribute="Number" context="#stay"/>
+        <HlCChar attribute="Char" context="#stay"/>
+      </context>
+      <context name="Comment" attribute="Comment" lineEndContext="#pop"/>
+      <context name="Preprocessor" attribute="Preprocessor" lineEndContext="#pop"/>
+      <context name="String" attribute="String" lineEndContext="#pop">
+        <AnyChar attribute="String" context="#pop" String="&quot;'"/>
+      </context>
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Registers" defStyleNum="dsKeyword"/>
+      <itemData name="Instructions" defStyleNum="dsKeyword"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
+      <itemData name="Label" defStyleNum="dsFunction"/>
+      <itemData name="Data" defStyleNum="dsDataType"/>
+      <itemData name="BaseN" defStyleNum="dsBaseN"/>
+      <itemData name="Float" defStyleNum="dsFloat"/>
+      <itemData name="Number" defStyleNum="dsDecVal"/>
+      <itemData name="Char" defStyleNum="dsChar"/>
+      <itemData name="String" defStyleNum="dsString"/>
+      <itemData name="Preprocessor" defStyleNum="dsOthers"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <keywords casesensitive="0"/>
+    <comments>
+      <comment name="singleLine" start=";"/>
+    </comments>
+  </general>
+</language>
+<!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/kate/data/ferite.xml b/kate/data/ferite.xml
index 7d1548275..84c442f73 100644
--- a/kate/data/ferite.xml
+++ b/kate/data/ferite.xml
@@ -43,21 +43,21 @@
         <HlCOct attribute="Octal" context="#stay" />
         <HlCHex attribute="Hex" context="#stay" />
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Multiline Comment" char="/" char1="*"/>
         <AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^{|}~"/>
-        <StringDetect attribute="Comment" context="Undeffed" String="#if 0" insensitive="FALSE"/>
+        <StringDetect attribute="Comment" context="Undeffed" String="#if 0" insensitive="false"/>
         <DetectChar attribute="Preprocessor" context="Preprocessor" char="#" column="0"/>
       </context>
       <context attribute="String" lineEndContext="#pop" name="String">
diff --git a/kate/data/fgl-4gl.xml b/kate/data/fgl-4gl.xml
index 2acbe8ff2..7b2084dbd 100644
--- a/kate/data/fgl-4gl.xml
+++ b/kate/data/fgl-4gl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="4GL" version="1.02" kateversion="2.5" section="Database" extensions="*.4gl;*.4GL;*.err" mimetype="text/x-4glsrc;text/x-4glerr" author="Andrej Falout (andrej@falout.org)" license="LGPL">
+<language name="4GL" version="1.02" kateversion="2.3" section="Database" extensions="*.4gl;*.4GL;*.err" mimetype="text/x-4glsrc;text/x-4glerr" author="Andrej Falout (andrej@falout.org)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> at </item>
@@ -274,14 +274,14 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
@@ -291,7 +291,7 @@
 <!--        <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Comment 2" char="/" char1="*"/>//-->
         <AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^|~"/>
-         <StringDetect attribute="Preprocessor" context="Comment 4" String="#if 0" insensitive="FALSE"/>
+         <StringDetect attribute="Preprocessor" context="Comment 4" String="#if 0" insensitive="false"/>
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#"/>
       </context>
       <context attribute="String" lineEndContext="#pop" name="String">
diff --git a/kate/data/fgl-per.xml b/kate/data/fgl-per.xml
index 9b3461ad8..44bc53151 100644
--- a/kate/data/fgl-per.xml
+++ b/kate/data/fgl-per.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="4GL-PER" version="1.02" kateversion="2.5" section="Database" extensions="*.per;*.PER;*.per.err" mimetype="text/x-4glper;text/x-4glpererr" author="Andrej Falout (andrej@falout.org)" license="LGPL">
+<language name="4GL-PER" version="1.02" kateversion="2.3" section="Database" extensions="*.per;*.PER;*.per.err" mimetype="text/x-4glper;text/x-4glpererr" author="Andrej Falout (andrej@falout.org)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item> by </item>
@@ -87,14 +87,14 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
@@ -103,7 +103,7 @@
         <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Comment 2" char="/" char1="*"/>
         <AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^|~"/>
-         <StringDetect attribute="Preprocessor" context="Comment 4" String="#if 0" insensitive="FALSE"/>
+         <StringDetect attribute="Preprocessor" context="Comment 4" String="#if 0" insensitive="false"/>
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#"/>
       </context>
       <context attribute="String" lineEndContext="#pop" name="String">
diff --git a/kate/data/fortran.xml b/kate/data/fortran.xml
index 43817994b..983395523 100644
--- a/kate/data/fortran.xml
+++ b/kate/data/fortran.xml
@@ -395,7 +395,7 @@
 
 <!-- This context highlights operators and the logical values .true. .false. -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_op_and_log">
-        <RegExpr attribute="Logical" context="#stay" String="\.(true|false)\." insensitive="TRUE"/>
+        <RegExpr attribute="Logical" context="#stay" String="\.(true|false)\." insensitive="true"/>
         <RegExpr attribute="Operator" context="#stay" String="\.[A-Za-z]+\."/>
         <RegExpr attribute="Operator" context="#stay" String="(==|/=|&lt;|&lt;=|&gt;|&gt;=)"/>
       </context>
@@ -426,11 +426,11 @@
 
 <!-- The following two contexts match input/output statements -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_io_stmnts">
-        <RegExpr attribute="IO Function" context="find_io_paren" String="\b(read|write|backspace|rewind|end\s*file|close)\s*[(]" insensitive="TRUE"/>
-        <RegExpr attribute="IO Function" context="find_io_paren" String="\bopen\s*[(]" insensitive="TRUE"/>
-        <RegExpr attribute="IO Function" context="find_io_paren" String="\binquire\s*[(]" insensitive="TRUE"/>
-        <RegExpr attribute="IO Function" context="format_stmnt" String="\bformat\s*[(]" insensitive="TRUE"/>
-        <RegExpr attribute="IO Function" context="#stay" String="\bend\s*file\b" insensitive="TRUE"/>
+        <RegExpr attribute="IO Function" context="find_io_paren" String="\b(read|write|backspace|rewind|end\s*file|close)\s*[(]" insensitive="true"/>
+        <RegExpr attribute="IO Function" context="find_io_paren" String="\bopen\s*[(]" insensitive="true"/>
+        <RegExpr attribute="IO Function" context="find_io_paren" String="\binquire\s*[(]" insensitive="true"/>
+        <RegExpr attribute="IO Function" context="format_stmnt" String="\bformat\s*[(]" insensitive="true"/>
+        <RegExpr attribute="IO Function" context="#stay" String="\bend\s*file\b" insensitive="true"/>
         <keyword attribute="IO Function" context="#stay" String="io_functions"/>
       </context>
 <!-- This context matches parenthesis for the read, write, ... statements -->
@@ -450,7 +450,7 @@
       <context attribute="Normal Text" lineEndContext="#stay" name="format_stmnt">
         <DetectChar attribute="IO Function" context="format_stmnt" char="("/>
         <DetectChar attribute="IO Function" context="#pop" char=")"/>
-        <RegExpr attribute="IO Function" context="#stay" String="[0-9]*/" insensitive="TRUE"/>
+        <RegExpr attribute="IO Function" context="#stay" String="[0-9]*/" insensitive="true"/>
         <AnyChar attribute="IO Function" context="#stay" String=":"/>
         <IncludeRules context="find_strings" />
         <IncludeRules context="find_symbols" />
@@ -458,39 +458,39 @@
 
 <!-- The following context matches the begin of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_begin_stmnts">
-        <RegExpr attribute="Keyword" context="#stay" String="\bmodule\s+procedure\b" insensitive="TRUE"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\b(subroutine|function|block\s*data)\b" insensitive="TRUE" beginRegion="Routine"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\b(program|module|block\s*data)\b" insensitive="TRUE" beginRegion="Routine"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\b(then|do)\b" insensitive="TRUE" beginRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bmodule\s+procedure\b" insensitive="true"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(subroutine|function|block\s*data)\b" insensitive="true" beginRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(program|module|block\s*data)\b" insensitive="true" beginRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(then|do)\b" insensitive="true" beginRegion="Block"/>
       </context>
 <!-- The following context matches the end of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_end_stmnts">
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(subroutine|function|block\s*data)\b" insensitive="TRUE" endRegion="Routine"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(program|module)\b" insensitive="TRUE" endRegion="Routine"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(do|if)\b" insensitive="TRUE" endRegion="Block"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(select|where|forall|interface)\b" insensitive="TRUE"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\belse\s*if\b" insensitive="TRUE" endRegion="Block"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bend\b" insensitive="TRUE" endRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(subroutine|function|block\s*data)\b" insensitive="true" endRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(program|module)\b" insensitive="true" endRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(do|if)\b" insensitive="true" endRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\s*(select|where|forall|interface)\b" insensitive="true"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\belse\s*if\b" insensitive="true" endRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bend\b" insensitive="true" endRegion="Routine"/>
       </context>
 <!-- The following context matches the mid of program units -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_mid_stmnts">
-        <RegExpr attribute="Keyword" context="#stay" String="\belse\b" insensitive="TRUE" endRegion="Block" beginRegion="Block"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bcontains\b" insensitive="TRUE" endRegion="Routine" beginRegion="Routine"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\belse\b" insensitive="true" endRegion="Block" beginRegion="Block"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bcontains\b" insensitive="true" endRegion="Routine" beginRegion="Routine"/>
       </context>
 
 <!-- The following two contexts match declarations -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_decls">
-        <RegExpr attribute="Data Type" context="#stay" String="\binteger[\*]\d{1,2}" insensitive="TRUE"/>
-        <RegExpr attribute="Data Type" context="#stay" String="\breal[\*]\d{1,2}" insensitive="TRUE"/>
-        <RegExpr attribute="Data Type" context="#stay" String="\bcomplex[\*]\d{1,2}" insensitive="TRUE"/>
-        <RegExpr attribute="Data Type" context="#stay" String="\bend\s*type\b" insensitive="TRUE"/>
+        <RegExpr attribute="Data Type" context="#stay" String="\binteger[\*]\d{1,2}" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="\breal[\*]\d{1,2}" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="\bcomplex[\*]\d{1,2}" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="\bend\s*type\b" insensitive="true"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
-        <RegExpr attribute="Data Type" context="#stay" String="^\s*data\b" insensitive="TRUE"/>
-        <RegExpr attribute="Data Type" context="find_paren" String="^\s*real\s*[(]" insensitive="TRUE"/>
-        <RegExpr attribute="Data Type" context="#stay" String="^\s*real(?![\w\*])" insensitive="TRUE"/>
-        <RegExpr attribute="Data Type" context="#stay" String="\bcharacter[*][0-9]+\b" insensitive="TRUE"/>
-        <RegExpr attribute="Data Type" context="find_paren" String="\b(type|integer|complex|character|logical|intent|dimension)\b\s*[(]" insensitive="TRUE"/>
-        <RegExpr attribute="Data Type" context="#stay" String="\b(type|integer|complex|character|logical|intent|dimension)\b" insensitive="TRUE"/>
+        <RegExpr attribute="Data Type" context="#stay" String="^\s*data\b" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="find_paren" String="^\s*real\s*[(]" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="^\s*real(?![\w\*])" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="\bcharacter[*][0-9]+\b" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="find_paren" String="\b(type|integer|complex|character|logical|intent|dimension)\b\s*[(]" insensitive="true"/>
+        <RegExpr attribute="Data Type" context="#stay" String="\b(type|integer|complex|character|logical|intent|dimension)\b" insensitive="true"/>
         <Detect2Chars attribute="Data Type" context="#stay" char=":" char1=":"/>
       </context>
 <!-- This context matches parenthesis in data type declarations, such as in 'real(...)'-->
@@ -512,13 +512,13 @@
 <!-- The following context matches integer and real numbers -->
       <context attribute="Normal Text" lineEndContext="#stay" name="find_numbers">
         <!-- Floating-point numbers with optional kind -->
-        <RegExpr attribute="Float" context="#stay" String="[0-9]*\.[0-9]+([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
-        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+\.[0-9]*([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?(?![a-z])" insensitive="TRUE"/>
-        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+[de][+-]?[0-9]+([_]([0-9]+|[a-z][\w_]*))?" insensitive="TRUE"/>
+        <RegExpr attribute="Float" context="#stay" String="[0-9]*\.[0-9]+([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?" insensitive="true"/>
+        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+\.[0-9]*([de][+-]?[0-9]+)?([_]([0-9]+|[a-z][\w_]*))?(?![a-z])" insensitive="true"/>
+        <RegExpr attribute="Float" context="#stay" String="\b[0-9]+[de][+-]?[0-9]+([_]([0-9]+|[a-z][\w_]*))?" insensitive="true"/>
         <!-- Integers with optional kind specifier -->
         <RegExpr attribute="Decimal" context="#stay" String="\b[0-9]+([_]([0-9]+|[a-zA-Z][\w_]*))?"/>
         <!-- Integers in binary, octal and hexadecimal notations -->
-        <RegExpr attribute="Decimal" context="#stay" String="\b[bozx]([&apos;][0-9a-f]+[&apos;]|[&quot;][0-9a-f]+[&quot;])" insensitive="TRUE"/>
+        <RegExpr attribute="Decimal" context="#stay" String="\b[bozx]([&apos;][0-9a-f]+[&apos;]|[&quot;][0-9a-f]+[&quot;])" insensitive="true"/>
       </context>
 
 <!-- The following four contexts implement the complex string multi-line declarations -->
diff --git a/kate/data/freebasic.xml b/kate/data/freebasic.xml
index d3bf41243..1072a2894 100644
--- a/kate/data/freebasic.xml
+++ b/kate/data/freebasic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="FreeBASIC" version="0.14" kateversion="2.3" section="Sources" extensions="*.bas;*.bi;*.BAS;*.BI" mimetype="text/x-freebasic" author="Chris Neugebauer (chrisjrn@gmail.com)" license="GPL">
+<language name="FreeBASIC" version="0.15" kateversion="2.3" section="Sources" extensions="*.bas;*.bi;*.BAS;*.BI" mimetype="text/x-freebasic" author="Chris Neugebauer (chrisjrn@gmail.com)" license="GPL">
   <highlighting>
     <list name="preproc">
     
@@ -567,7 +567,7 @@
 
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Data Types" context="#stay" String="Data Types"/>
-        <keyword attribute="preproc" context="#stay" lineEndContext="#pop" String="Preprocessor"/>
+        <keyword attribute="preproc" context="#stay" String="Preprocessor"/>
          
         <keyword attribute="Functions" context="#stay" String="functions"/>
         <RegExpr attribute="Constant" context="#stay" String="\#+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"/>
@@ -594,15 +594,14 @@
       <itemData name="Number" defStyleNum="dsDecVal"/>
       <itemData name="String" defStyleNum="dsString"/>
       <itemData name="Comment" defStyleNum="dsComment"/>
-      <itemData name="Region Marker " defStyleNum="dsRegionMarker"/>
-      <itemData name="Preprocessor" defStyleNum="dsPreProc"/>
+      <itemData name="Region Marker" defStyleNum="dsRegionMarker"/>
+      <itemData name="Preprocessor" defStyleNum="dsPreprocessor"/>
     </itemDatas>
   </highlighting>
   <general>
     <keywords casesensitive="0" />
     <comments>
       <comment name="singleLine" start="'" />
-      <comment name="remark" start="REM " />
     </comments>
   </general>
 </language>
diff --git a/kate/data/fsharp.xml b/kate/data/fsharp.xml
index e5180e3bc..6c53e317f 100644
--- a/kate/data/fsharp.xml
+++ b/kate/data/fsharp.xml
@@ -9,7 +9,7 @@
 <!ENTITY ESC    "(\\[ntbr'&quot;\\]|\\[0-9]{3}|\\x[0-9A-Fa-f]{2})"> <!-- OCaml character code escapes. -->
 <!ENTITY DEC    "[0-9][0-9_]*">                                     <!-- Decimal digits with underscores. -->
 ]>
-<language name="FSharp" version="0.0.1" kateversion="2.4" section="Sources" extensions="*.fs;*.fsi;*.fsx" mimetype="" priority="10" author="Bas Bossink (bas.bossink@gmail.com)" license="LGPL">
+<language name="FSharp" version="0.1" kateversion="2.4" section="Sources" extensions="*.fs;*.fsi;*.fsx" mimetype="" priority="10" author="Bas Bossink (bas.bossink@gmail.com)" license="LGPL">
 
   <highlighting>
     <list name="keywords">
diff --git a/kate/data/ftl.xml b/kate/data/ftl.xml
new file mode 100644
index 000000000..84a2585a8
--- /dev/null
+++ b/kate/data/ftl.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="FTL" version="1.10" kateversion="2.3" section="Markup" extensions="*.ftl" license="LGPLv2+" author="Radomir Svancer (svancer@gmail.com), Robert Kratky (kratky@rob.cz>), Matthias Mailänder (matthias.mailaender@vogella.com)">
+  <highlighting>
+    <contexts>
+        <context name="comment start" attribute="NormalText" lineEndContext="#stay">
+            <StringDetect attribute="Comment" context="comment end" String="&lt;!--"/>
+            <StringDetect attribute="FTLComment" context="comment ending" String="&lt;#--"/>
+            <RegExpr attribute="FTLKeyword" context="syntax start" String="&lt;\s*\/?\s*[#@][a-zA-Z0-9_]*" />
+            <StringDetect attribute="FTLMark" context="variable end" String="${" />
+            <RegExpr attribute="Keyword" context="logic end" String="&lt;\s*\/?\s*[a-zA-Z0-9_]*" />
+        </context>
+
+        <context name="logic end" attribute="Identifier" lineEndContext="#stay">
+            <DetectChar attribute="Keyword" context="#pop" char="&gt;"/>
+            <RegExpr attribute="NormalText" context="logic" String="\s*=\s*"/>
+            <StringDetect attribute="FTLComment" context="comment ending" String="&lt;#--"/>
+            <RegExpr attribute="FTLKeyword" context="syntax start" String="&lt;\s*\/?\s*[#@][a-zA-Z0-9_]*" />
+            <StringDetect attribute="FTLMark" context="variable end" String="${" />
+        </context>
+
+        <context name="logic" attribute="Types" lineEndContext="#stay">
+            <RegExpr attribute="Types" context="#pop" String="\s*#?[a-zA-Z0-9]*" />
+            <DetectChar attribute="Types" context="logic start" char="&quot;" />
+        </context>
+
+        <context name="logic start" attribute="Types" lineEndContext="#stay">
+            <DetectChar attribute="Types" context="#pop#pop" char="&quot;" />
+            <StringDetect attribute="FTLComment" context="comment ending" String="&lt;#--"/>
+            <RegExpr attribute="FTLKeyword" context="syntax start" String="&lt;\s*\/?\s*[#@][a-zA-Z0-9_]*" />
+            <StringDetect attribute="FTLMark" context="variable end" String="${" />
+        </context>
+
+        <context name="comment" attribute="Comment" lineEndContext="#pop"/>
+
+        <context name="values" attribute="String" lineEndContext="#pop">
+            <DetectChar attribute="String" context="#pop" char="'"/>
+        </context>
+
+        <context name="comment end" attribute="Comment" lineEndContext="#stay">
+            <StringDetect attribute="Comment" context="#pop" String="--&gt;"/>
+            <StringDetect attribute="FTLComment" context="comment ending" String="&lt;#--"/>
+            <RegExpr attribute="FTLKeyword" context="syntax start" String="&lt;\s*\/?\s*[#@][a-zA-Z0-9_]*" />
+            <StringDetect attribute="FTLMark" context="variable end" String="${" />
+        </context>
+
+        <context name="comment ending" attribute="FTLComment" lineEndContext="#stay">
+            <StringDetect attribute="FTLComment" context="#pop" String="--&gt;"/>
+        </context>
+
+        <context name="syntax start" attribute="FTLKeyword" lineEndContext="#stay">
+            <DetectChar attribute="FTLKeyword" context="#pop" char="&gt;"/>
+            <DetectChar attribute="FTLQuot" context="comment string" char="&quot;" />
+            <RegExpr attribute="FTLIdentifier" context="syntax end" String="\s*"/>
+        </context>
+
+        <context name="comment string" attribute="FTLQuot" lineEndContext="#stay">
+            <DetectChar attribute="FTLQuot" context="#pop#pop" char="&quot;" />
+        </context>
+
+        <context name="syntax end" attribute="FTLIdentifier" lineEndContext="#stay">
+            <DetectChar attribute="FTLKeyword" context="#pop#pop" char="&gt;"/>
+            <DetectChar attribute="FTLQuot" context="comment string" char="&quot;" />
+        </context>
+
+        <context name="variable end" attribute="FTLIdentifier" lineEndContext="#stay">
+            <DetectChar attribute="FTLMark" context="#pop" char="}"/>
+            <DetectChar attribute="FTLQuot" context="comment string" char="&quot;" />
+        </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="NormalText" defStyleNum="dsNormal"/>
+      <itemData name="Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Identifier" defStyleNum="dsOthers"/>
+      <itemData name="Types" defStyleNum="dsDataType"/>
+      <itemData name="String" defStyleNum="dsString"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
+      <itemData name="FTLComment" defStyleNum="dsComment" color="#7777cc" selColor="#00ff00" bold="0" italic="1"/>
+      <itemData name="FTLKeyword" defStyleNum="dsKeyword" color="#0000cc" selColor="#00ff00" bold="1" italic="0"/>
+      <itemData name="FTLQuot" defStyleNum="dsOthers" color="#ff0044" selColor="#00ff00" bold="0" italic="0"/>
+      <itemData name="FTLIdentifier" defStyleNum="dsOthers" color="#0022bb" selColor="#00ff00" bold="0" italic="0"/>
+      <itemData name="FTLMark" defStyleNum="dsOthers" color="#0000cc" selColor="#00ff00" bold="1" italic="1"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="multiLine" start="&lt;#--" end="--&gt;" />
+    </comments>
+    <keywords casesensitive="0" />
+  </general>
+</language>
diff --git a/kate/data/gdl.xml b/kate/data/gdl.xml
index a41af14c4..84f4f9897 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.0" section="Scientific" extensions="*.gdl;*.vcg;*.GDL;*.VCG" mimetype="">
+<language name="GDL" version="1.01" kateversion="2.2" section="Scientific" extensions="*.gdl;*.vcg;*.GDL;*.VCG" mimetype="">
  <highlighting>
   <list name="colors">
    <item> white </item>
diff --git a/kate/data/gettext.xml b/kate/data/gettext.xml
index 95ef695d8..56560ddd2 100644
--- a/kate/data/gettext.xml
+++ b/kate/data/gettext.xml
@@ -23,7 +23,7 @@
   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
   Boston, MA  02110-1301, USA.
  -->
-<language name="GNU Gettext" version="2.00-1" kateversion="2.4" section="Markup" extensions="*.po;*.pot" mimetype="text/x-gettext-translation" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
+<language name="GNU Gettext" version="2.01-1" kateversion="2.4" section="Markup" extensions="*.po;*.pot" mimetype="text/x-gettext-translation" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
   <highlighting>
 
     <contexts>
@@ -83,7 +83,7 @@
         <DetectChar attribute = "StringTag" char="&gt;" context="#pop"/>
         <DetectChar attribute = "String" char="&quot;" context="StringWrapSub"/>
       </context>
-      <context name = "StringWrap" lineEndContext="#stay">
+      <context name = "StringWrap" attribute = "String" lineEndContext="#stay">
         <DetectChar attribute = "String" char="&quot;" context="#pop"/>
         <RegExpr String="." lookAhead="true" context="#pop#pop"/>
       </context>
@@ -97,7 +97,7 @@
         <StringDetect attribute = "StringDiffOldWrap" String="-}" context="#pop"/>
         <DetectChar attribute = "String" char="&quot;" context="StringWrapSub"/>
       </context>
-      <context name = "StringWrapSub" lineEndContext="#stay">
+      <context name = "StringWrapSub" attribute = "String" lineEndContext="#stay">
         <DetectChar attribute = "String" char="&quot;" context="#pop"/>
         <RegExpr String="." lookAhead="true" context="#pop#pop#pop"/>
       </context>
@@ -139,12 +139,12 @@
         <StringDetect attribute = "StringDiffOldWrapPrevious" String="-}" context="#pop"/>
         <DetectChar attribute = "StringPrevious" char="&quot;" context="StringWrapSubPrevious"/>
       </context>
-      <context name = "StringWrapPrevious" lineEndContext="#stay">
+      <context name = "StringWrapPrevious" attribute = "StringPrevious" lineEndContext="#stay">
         <RegExpr String="[^#]" firstNonSpace="true" lookAhead="true" context="#pop#pop"/>
         <RegExpr attribute = "StringPrevious" String="(#\|)? *&quot;" context="#pop"/>
         <RegExpr String="." lookAhead="true" context="#pop#pop"/>
       </context>
-      <context name = "StringWrapSubPrevious" lineEndContext="#stay">
+      <context name = "StringWrapSubPrevious" attribute = "StringPrevious" lineEndContext="#stay">
         <RegExpr String="[^#]" firstNonSpace="true" lookAhead="true" context="#pop#pop#pop"/>
         <RegExpr attribute = "StringPrevious" String="(#\|)? *&quot;" context="#pop"/>
         <RegExpr String="." lookAhead="true" context="#pop#pop#pop"/>
diff --git a/kate/data/git-ignore.xml b/kate/data/git-ignore.xml
new file mode 100644
index 000000000..ab4a7841b
--- /dev/null
+++ b/kate/data/git-ignore.xml
@@ -0,0 +1,40 @@
+<?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">
+    <highlighting>
+        <contexts>
+           
+            <context name="ini" attribute="Normal Text" lineEndContext="#pop">
+                <DetectChar char="#" attribute="Comment" context="Comment" />
+                <RegExpr attribute="Include" String="^!.*" context="Include"/>
+                <RegExpr attribute="Exclude" String=".*"  context="Exclude" />
+            </context>
+            
+            <context name="Comment" attribute="Comment" lineEndContext="#pop">
+                <DetectSpaces />
+            </context>                                                                                          
+        
+            <context name="Include" attribute="Include" lineEndContext="#pop">
+            </context>
+
+            <context name="Exclude" attribute="Exclude" lineEndContext="#pop">
+            </context>
+        
+        </contexts>
+        
+        <itemDatas>
+            <itemData name="Comment" defStyleNum="dsComment" />
+            <itemData name="Exclude" defStyleNum="dsString" />
+            <itemData name="Include" defStyleNum="dsChar" />
+        </itemDatas>
+    
+    </highlighting>
+
+    <general>
+        <comments>
+            <comment name="singleLine" start="#" />
+        </comments>
+        <keywords casesensitive="0" />
+    </general>
+</language>
+
diff --git a/kate/data/gitolite.xml b/kate/data/gitolite.xml
new file mode 100644
index 000000000..63e21bc17
--- /dev/null
+++ b/kate/data/gitolite.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<language version="0.1" kateversion="2.4" name="Gitolite" section="Configuration" extensions="gitolite.conf" author="Andor Dávid (david-andor@kozpontiagy.hu)" license="GPL">
+  <highlighting>
+    <list name="keywords">
+      <item>repo</item>
+    </list>
+
+    <contexts>
+      <context name="Normal Text" attribute="Normal Text" lineEndContext="#pop">
+        <DetectChar                     context="SingleLineComment" char="#" />
+        <keyword attribute="Keyword"    context="#stay"   String="keywords" />
+        <RegExpr attribute="Group"      context="#stay"   String="\@[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*" />
+        <RegExpr attribute="Symbol"     context="Value"   String="=" />
+      </context>
+
+      <context name="SingleLineComment" attribute="Comment (Single)" lineEndContext="#pop" ></context>
+
+      <context name="Value" attribute="Value" lineEndContext="#pop">
+        <RegExpr attribute="Group"       context="#stay" String="\@[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*" />
+      </context>
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Normal Text"      defStyleNum="dsNormal"/>
+      <itemData name="Comment (Single)" defStyleNum="dsComment" />
+      <itemData name="Keyword"          defStyleNum="dsKeyword" spellChecking="false" />
+      <itemData name="Group"            defStyleNum="dsKeyword" spellChecking="false" />
+ <!-- <itemData name="Refs"             defStyleNum="dsKeyword" spellChecking="false" /> -->
+      <itemData name="Symbol"           defStyleNum="dsString" />
+    </itemDatas>
+  </highlighting>
+
+  <general>
+    <keywords casesensitive="1" />
+
+    <comments>
+      <comment name="singleLine" start="#" />
+    </comments>
+
+  </general>
+
+  <!-- kate: space-indent on indent-width 2 replace-tabs on indent-mode xml -->
+</language>
diff --git a/kate/data/glosstex.xml b/kate/data/glosstex.xml
index b9a98866b..55abf4ed3 100644
--- a/kate/data/glosstex.xml
+++ b/kate/data/glosstex.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="GlossTex" version="0.01" kateversion="2.1" extensions="*.gdf" section="Markup" mimetype="text/x-gdf" casesensitive="1" author="Thomas Braun(braun@physik.fu-berlin.de)" license="LGPL">
+<language name="GlossTex" version="0.01" kateversion="2.4" extensions="*.gdf" section="Markup" mimetype="text/x-gdf" casesensitive="1" author="Thomas Braun(braun@physik.fu-berlin.de)" license="LGPL">
   <highlighting>
     <contexts>
       <context name="Comment" attribute="Comment" lineEndContext="#stay">
diff --git a/kate/data/gnuplot.xml b/kate/data/gnuplot.xml
index dee90da0c..76e21dd85 100644
--- a/kate/data/gnuplot.xml
+++ b/kate/data/gnuplot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Gnuplot" version="0.1" kateversion="2.1" section="Scripts" extensions="*.gnuplot;*.gp;*.gplt" casesensitive="1" >
+<language name="Gnuplot" version="0.1" kateversion="2.2" section="Scripts" extensions="*.gnuplot;*.gp;*.gplt" casesensitive="1" >
   <highlighting>
    <list name="set_no_keywords">
        <item> noarrow </item>
diff --git a/kate/data/haskell.xml b/kate/data/haskell.xml
index 49583a116..104e43dda 100644
--- a/kate/data/haskell.xml
+++ b/kate/data/haskell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Haskell" version="2.2" kateversion="2.3" section="Sources" extensions="*.hs;*.chs" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell">
+<language name="Haskell" version="2.4" kateversion="2.3" section="Sources" extensions="*.hs;*.chs" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell" style="haskell">
   <highlighting>
   <list name="keywords">
     <item> case </item>
@@ -343,8 +343,10 @@
       <RegExpr attribute="Operator"         context="#stay" String="([A-Z][a-zA-Z0-0_']*\.)*[\-!#\$%&amp;\*\+/&lt;=&gt;\?&#92;@\^\|~\.:]+" />
       <RegExpr attribute="Type"             context="#stay" String="([A-Z][a-zA-Z0-9_']*\.)*[A-Z][a-zA-Z0-9_']*" />
 
+      <RegExpr    attribute="Float"   context="#stay" String ="\d+\.\d+([Ee][+-]?\d+)?|\d+[Ee][+-]?\d+"/>
+      <RegExpr    attribute="Octal"   context="#stay" String="0[Oo][0-7]+"/>
+      <RegExpr    attribute="Hex"     context="#stay" String="0[Xx][0-9A-Fa-f]+"/>
       <Int        attribute="Decimal" context="#stay" />
-      <RegExpr    attribute="Float"   context="#stay" String="\d+\.\d+" />
       <DetectChar attribute="Char"    context="char" char="'" />
       <DetectChar attribute="String"  context="string" char="&quot;" />
 
@@ -430,6 +432,8 @@
     <itemData name="Type"             defStyleNum="dsDataType" spellChecking="false" />
     <itemData name="Special"          defStyleNum="dsOthers"  spellChecking="false" />
 
+    <itemData name="Octal"            defStyleNum="dsBaseN"    spellChecking="false" />
+    <itemData name="Hex"              defStyleNum="dsBaseN"    spellChecking="false" />
     <itemData name="Decimal"          defStyleNum="dsDecVal"   spellChecking="false" />
     <itemData name="Float"            defStyleNum="dsFloat"    spellChecking="false" />
     <itemData name="Char"             defStyleNum="dsChar"     spellChecking="false" />
diff --git a/kate/data/haxe.xml b/kate/data/haxe.xml
new file mode 100644
index 000000000..72f179578
--- /dev/null
+++ b/kate/data/haxe.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+  ========================================================================
+
+  Haxe Language highlighting.
+
+  ========================================================================
+  
+  Author: Chad Joan
+  
+  ========================================================================
+-->
+
+<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">
+  <highlighting>
+    <list name="keywords">
+    
+      <item> break </item>
+      
+      <item> case </item>
+      <item> cast </item>
+      <item> catch </item>
+      <item> class </item>
+      <item> continue </item>
+      
+      <item> default </item>
+
+      <item> else </item>
+      <item> enum </item>
+      <item> extends </item>
+      
+      <item> false </item>
+      <item> for </item>
+      <item> function </item>
+      
+      <item> if </item>
+      <item> implements </item>
+      <item> in </item>
+      <item> inline </item>
+      <item> interface </item>
+      
+      <item> new </item>
+      <item> null </item>
+      
+      <item> override </item>
+      
+      <item> private </item>
+      <item> public </item>
+      
+      <item> return </item>
+      
+      <item> static </item>
+      <item> super </item>
+      <item> switch </item>
+      
+      <item> this </item>
+      <item> throw </item>
+      <item> trace </item>
+      <item> true </item>
+      <item> try </item>
+      <item> typedef </item>
+      
+      <item> untyped </item>
+      
+      <item> var </item>
+      
+      <item> while </item>
+
+    </list>
+
+    <list name="modules">
+      <item> package </item>
+      <item> import </item>
+    </list>
+
+    <list name="types">
+      <item> Array </item>
+      <item> Void </item>
+      <item> Bool </item>
+      <item> Int </item>
+      <item> UInt </item>
+      <item> Float </item>
+      <item> Dynamic </item>
+      <item> String </item>
+      <item> List </item>
+      <item> Error </item>
+      <item> Unknown </item>
+      <item> Type </item>
+    </list>
+
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="normal">
+        <RegExpr attribute="Preprocessor" context="#pop" String="#if(\s+\w+)?" />
+        <RegExpr attribute="Preprocessor" context="#pop" String="#(else|elseif|end|error)" />
+
+        <keyword attribute="Keyword"        context="#stay"      String="keywords"/>
+        <keyword attribute="Module"         context="ModuleName" String="modules"/>
+        <keyword attribute="Type"           context="#stay"      String="types"/>
+      
+        <DetectIdentifier attribute="Normal Text"/>
+
+        <HlCStringChar attribute="EscapeString" context="#pop"/>
+
+        <DetectChar attribute="RawString" context="RawString"   char="'"/>
+        <DetectChar attribute="String"    context="String"      char="&quot;"/>
+
+        <Detect2Chars attribute="Comment" context="CommentLine"   char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="CommentBlock" char="/" char1="*" beginRegion="CommentBlock"/>
+
+        <DetectChar attribute="Normal Text" context="#stay" char="{" beginRegion="BraceA" />
+        <DetectChar attribute="Normal Text" context="#stay" char="}" endRegion="BraceA" />
+
+        <!-- Match ... and .. before numbers are matched. -->
+        <StringDetect attribute="Normal Text" context="#pop" String="..."/>
+        <Detect2Chars attribute="Normal Text"   char="." char1="."/>
+
+        <!-- Float -->
+        <!-- Floats must be matched before Binary|Octal|Hex|Integer -->
+        <!-- All floats except integers -->
+        <RegExpr attribute="Float" context="#pop" String="[\d][\d]*(\.(?!\.)[\d]*([eE][-+]?[\d]+)?)"/>
+        <RegExpr attribute="Float" context="#pop" String="\.[\d][\d]*([eE][-+]?[\d]+)?"/>
+
+        <!-- Hex|Integer -->
+        <RegExpr attribute="Hex"     context="#pop" String="0[xX][\da-fA-F]+"/>
+        <RegExpr attribute="Integer" context="#pop" String="\d+"/>
+      </context>
+
+      <context attribute="Module Name" lineEndContext="#stay" name="ModuleName">
+        <Detect2Chars attribute="Comment"     context="CommentLine"   char="/" char1="/"/>
+        <Detect2Chars attribute="Comment"     context="CommentBlock" char="/" char1="*" beginRegion="CommentBlock"/>
+        <RegExpr context="#pop" String="[^\s\w.:,]"/>
+      </context>
+
+      <!-- Strings -->
+      <!-- '...' -->
+      <context attribute="RawString" lineEndContext="#stay" name="RawString">
+        <DetectChar attribute="RawString" context="#pop" char="'"/>
+      </context>
+      <!-- "..." -->
+      <context attribute="String" lineEndContext="#stay" name="String">
+        <Detect2Chars attribute="String" context="#stay" char="\" char1="&quot;"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+        <HlCStringChar attribute="EscapeSequence"/>
+        <RegExpr attribute="EscapeSequence" context="#stay" String="\\(u[\da-fA-F]{4}|U[\da-fA-F]{8}|&amp;[a-zA-Z]\w+;)" />
+      </context>
+
+      <!-- Comments -->
+      <context attribute="Comment" lineEndContext="#pop" name="CommentLine"/>
+      <context attribute="Comment" lineEndContext="#stay" name="CommentBlock">
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="CommentBlock"/>
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text"    defStyleNum="dsNormal"/>
+      <itemData name="Keyword"        defStyleNum="dsKeyword"/>
+      <itemData name="Type"           defStyleNum="dsDataType"/>
+      <itemData name="Integer"        defStyleNum="dsDecVal"/>
+      <itemData name="Hex"            defStyleNum="dsBaseN"/>
+      <itemData name="Float"          defStyleNum="dsFloat"/>
+
+      <itemData name="Module"         defStyleNum="dsKeyword"  color="#0000ff" selColor="#ffffff"/>
+      <itemData name="Module Name"    defStyleNum="dsNormal"  color="#0000ff" selColor="#ffffff"/>
+
+      <itemData name="EscapeSequence" defStyleNum="dsString" color="#00aa88" selColor="#ff0000"/>
+      <itemData name="String"         defStyleNum="dsString"/>
+      <itemData name="RawString"      defStyleNum="dsString"/>
+
+      <itemData name="Comment"        defStyleNum="dsComment"/>
+      
+      <itemData name="Preprocessor"   defStyleNum="dsOthers"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="//"/>
+      <comment name="multiLine" start="/*" end="*/" />
+    </comments>
+    <keywords casesensitive="true"/>
+  </general>
+</language>
diff --git a/kate/data/html-php.xml b/kate/data/html-php.xml
index 010297417..90a65b992 100644
--- a/kate/data/html-php.xml
+++ b/kate/data/html-php.xml
@@ -25,41 +25,41 @@
     <DetectIdentifier/>
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
     <StringDetect attribute="CDATA" context="CDATA" String="&lt;![CDATA[" beginRegion="cdata" />
-    <RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" insensitive="TRUE" beginRegion="doctype"  />
+    <RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" insensitive="true" beginRegion="doctype"  />
     <RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:-]*" beginRegion="pi" />
-    <RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="TRUE" beginRegion="style" />
-    <RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="TRUE" beginRegion="script" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="TRUE" beginRegion="pre" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="TRUE" beginRegion="div" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="TRUE" beginRegion="table" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;ul\b" insensitive="TRUE" beginRegion="ul" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;ol\b" insensitive="TRUE" beginRegion="ol" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;dl\b" insensitive="TRUE" beginRegion="dl" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;article\b" insensitive="TRUE" beginRegion="article" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;aside\b" insensitive="TRUE" beginRegion="aside" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;details\b" insensitive="TRUE" beginRegion="details" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;figure\b" insensitive="TRUE" beginRegion="figure" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;footer\b" insensitive="TRUE" beginRegion="footer" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;header\b" insensitive="TRUE" beginRegion="header" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;main\b" insensitive="TRUE" beginRegion="main" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;nav\b" insensitive="TRUE" beginRegion="nav" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;section\b" insensitive="TRUE" beginRegion="section" />
+    <RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="true" beginRegion="style" />
+    <RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="true" beginRegion="script" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="true" beginRegion="pre" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="true" beginRegion="div" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="true" beginRegion="table" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;ul\b" insensitive="true" beginRegion="ul" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;ol\b" insensitive="true" beginRegion="ol" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;dl\b" insensitive="true" beginRegion="dl" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;article\b" insensitive="true" beginRegion="article" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;aside\b" insensitive="true" beginRegion="aside" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;details\b" insensitive="true" beginRegion="details" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;figure\b" insensitive="true" beginRegion="figure" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;footer\b" insensitive="true" beginRegion="footer" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;header\b" insensitive="true" beginRegion="header" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;main\b" insensitive="true" beginRegion="main" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;nav\b" insensitive="true" beginRegion="nav" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;section\b" insensitive="true" beginRegion="section" />
     <RegExpr attribute="Element" context="El Open" String="&lt;&name;" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="TRUE" endRegion="pre" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="TRUE" endRegion="div" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="TRUE" endRegion="table" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/ul\b" insensitive="TRUE" endRegion="ul" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/ol\b" insensitive="TRUE" endRegion="ol" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/dl\b" insensitive="TRUE" endRegion="dl" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/article\b" insensitive="TRUE" endRegion="article" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/aside\b" insensitive="TRUE" endRegion="aside" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/details\b" insensitive="TRUE" endRegion="details" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/figure\b" insensitive="TRUE" endRegion="figure" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/footer\b" insensitive="TRUE" endRegion="footer" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/header\b" insensitive="TRUE" endRegion="header" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/main\b" insensitive="TRUE" endRegion="main" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/nav\b" insensitive="TRUE" endRegion="nav" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/section\b" insensitive="TRUE" endRegion="section" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="true" endRegion="pre" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="true" endRegion="div" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="true" endRegion="table" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/ul\b" insensitive="true" endRegion="ul" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/ol\b" insensitive="true" endRegion="ol" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/dl\b" insensitive="true" endRegion="dl" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/article\b" insensitive="true" endRegion="article" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/aside\b" insensitive="true" endRegion="aside" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/details\b" insensitive="true" endRegion="details" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/figure\b" insensitive="true" endRegion="figure" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/footer\b" insensitive="true" endRegion="footer" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/header\b" insensitive="true" endRegion="header" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/main\b" insensitive="true" endRegion="main" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/nav\b" insensitive="true" endRegion="nav" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/section\b" insensitive="true" endRegion="section" />
     <RegExpr attribute="Element" context="El Close" String="&lt;/&name;" />
     <!-- as long as kde gives DTDs the text/html mimetype--><IncludeRules context="FindDTDRules" />
     <IncludeRules context="FindEntityRefs" />
@@ -183,7 +183,7 @@
 
   <context name="CSS content" attribute="Other Text" lineEndContext="#stay">
 <IncludeRules context="FindPHP" />
-    <RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="TRUE" endRegion="style" />
+    <RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="true" endRegion="style" />
     <IncludeRules context="##CSS/PHP" includeAttrib="true"/>
   </context>
 
@@ -197,14 +197,14 @@
 
   <context name="JS content" attribute="Other Text" lineEndContext="#stay">
 <IncludeRules context="FindPHP" />
-    <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
-    <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
-    <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
+    <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="true" endRegion="script" />
+    <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="true" />
+    <IncludeRules context="Normal##JavaScript/PHP" includeAttrib="true"/>
   </context>
 
   <context name="JS comment close" attribute="Comment" lineEndContext="#pop">
 <IncludeRules context="FindPHP" />
-    <RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
+    <RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="true" endRegion="script" />
     <IncludeRules context="##Alerts" />
   </context>
 
@@ -234,7 +234,7 @@
     <IncludeRules context="FindEntityRefs" />
   </context>
 
-<context name="FindPHP">
+<context name="FindPHP" attribute="Normal Text" lineEndContext="#stay">
 <RegExpr context="##PHP/PHP" String="&lt;\?(?:=|php)?" lookAhead="true" />
 </context>
 </contexts>
diff --git a/kate/data/html.xml b/kate/data/html.xml
index 9bdd4b77d..3f80d2225 100644
--- a/kate/data/html.xml
+++ b/kate/data/html.xml
@@ -17,41 +17,41 @@
     <DetectIdentifier/>
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
     <StringDetect attribute="CDATA" context="CDATA" String="&lt;![CDATA[" beginRegion="cdata" />
-    <RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" insensitive="TRUE" beginRegion="doctype"  />
+    <RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" insensitive="true" beginRegion="doctype"  />
     <RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:-]*" beginRegion="pi" />
-    <RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="TRUE" beginRegion="style" />
-    <RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="TRUE" beginRegion="script" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="TRUE" beginRegion="pre" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="TRUE" beginRegion="div" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="TRUE" beginRegion="table" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;ul\b" insensitive="TRUE" beginRegion="ul" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;ol\b" insensitive="TRUE" beginRegion="ol" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;dl\b" insensitive="TRUE" beginRegion="dl" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;article\b" insensitive="TRUE" beginRegion="article" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;aside\b" insensitive="TRUE" beginRegion="aside" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;details\b" insensitive="TRUE" beginRegion="details" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;figure\b" insensitive="TRUE" beginRegion="figure" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;footer\b" insensitive="TRUE" beginRegion="footer" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;header\b" insensitive="TRUE" beginRegion="header" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;main\b" insensitive="TRUE" beginRegion="main" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;nav\b" insensitive="TRUE" beginRegion="nav" />
-    <RegExpr attribute="Element" context="El Open" String="&lt;section\b" insensitive="TRUE" beginRegion="section" />
+    <RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="true" beginRegion="style" />
+    <RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="true" beginRegion="script" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="true" beginRegion="pre" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="true" beginRegion="div" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="true" beginRegion="table" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;ul\b" insensitive="true" beginRegion="ul" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;ol\b" insensitive="true" beginRegion="ol" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;dl\b" insensitive="true" beginRegion="dl" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;article\b" insensitive="true" beginRegion="article" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;aside\b" insensitive="true" beginRegion="aside" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;details\b" insensitive="true" beginRegion="details" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;figure\b" insensitive="true" beginRegion="figure" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;footer\b" insensitive="true" beginRegion="footer" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;header\b" insensitive="true" beginRegion="header" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;main\b" insensitive="true" beginRegion="main" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;nav\b" insensitive="true" beginRegion="nav" />
+    <RegExpr attribute="Element" context="El Open" String="&lt;section\b" insensitive="true" beginRegion="section" />
     <RegExpr attribute="Element" context="El Open" String="&lt;&name;" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="TRUE" endRegion="pre" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="TRUE" endRegion="div" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="TRUE" endRegion="table" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/ul\b" insensitive="TRUE" endRegion="ul" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/ol\b" insensitive="TRUE" endRegion="ol" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/dl\b" insensitive="TRUE" endRegion="dl" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/article\b" insensitive="TRUE" endRegion="article" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/aside\b" insensitive="TRUE" endRegion="aside" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/details\b" insensitive="TRUE" endRegion="details" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/figure\b" insensitive="TRUE" endRegion="figure" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/footer\b" insensitive="TRUE" endRegion="footer" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/header\b" insensitive="TRUE" endRegion="header" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/main\b" insensitive="TRUE" endRegion="main" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/nav\b" insensitive="TRUE" endRegion="nav" />
-    <RegExpr attribute="Element" context="El Close" String="&lt;/section\b" insensitive="TRUE" endRegion="section" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="true" endRegion="pre" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="true" endRegion="div" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="true" endRegion="table" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/ul\b" insensitive="true" endRegion="ul" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/ol\b" insensitive="true" endRegion="ol" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/dl\b" insensitive="true" endRegion="dl" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/article\b" insensitive="true" endRegion="article" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/aside\b" insensitive="true" endRegion="aside" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/details\b" insensitive="true" endRegion="details" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/figure\b" insensitive="true" endRegion="figure" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/footer\b" insensitive="true" endRegion="footer" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/header\b" insensitive="true" endRegion="header" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/main\b" insensitive="true" endRegion="main" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/nav\b" insensitive="true" endRegion="nav" />
+    <RegExpr attribute="Element" context="El Close" String="&lt;/section\b" insensitive="true" endRegion="section" />
     <RegExpr attribute="Element" context="El Close" String="&lt;/&name;" />
     <!-- as long as kde gives DTDs the text/html mimetype--><IncludeRules context="FindDTDRules" />
     <IncludeRules context="FindEntityRefs" />
@@ -157,7 +157,7 @@
   </context>
 
   <context name="CSS content" attribute="Other Text" lineEndContext="#stay">
-    <RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="TRUE" endRegion="style" />
+    <RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="true" endRegion="style" />
     <IncludeRules context="##CSS" includeAttrib="true"/>
   </context>
 
@@ -169,13 +169,13 @@
   </context>
 
   <context name="JS content" attribute="Other Text" lineEndContext="#stay">
-    <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
-    <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
+    <RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="true" endRegion="script" />
+    <RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="true" />
     <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
   </context>
 
   <context name="JS comment close" attribute="Comment" lineEndContext="#pop">
-    <RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
+    <RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="true" endRegion="script" />
     <IncludeRules context="##Alerts" />
   </context>
 
diff --git a/kate/data/hunspell-aff.xml b/kate/data/hunspell-aff.xml
new file mode 100644
index 000000000..bf1c14218
--- /dev/null
+++ b/kate/data/hunspell-aff.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd" >
+<language name="Hunspell Affix File" section="Other" extensions="*.aff" priority="-9" version="1" kateversion="2.4" 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>
+
+<!-- This list is commented out. We use a simple fallback rule instead …
+<list name="list_keywordsWithNumbersOrFlags">
+
+	<!- - keywords without options: - - >
+	<item>ONLYMAXDIFF</item>
+	<item>NOSPLITSUGS</item>
+	<item>SUGSWITHDOTS</item>
+	<item>FORBIDWARN</item>
+	<item>CHECKCOMPOUNDDUP</item>
+	<item>CHECKCOMPOUNDREP</item>
+	<item>CHECKCOMPOUNDCASE</item>
+	<item>CHECKCOMPOUNDTRIPLE</item>
+	<item>SIMPLIFIEDTRIPLE</item>
+	<item>FULLSTRIP</item>
+	<item>CHECKSHARPS</item>
+	<item>COMPLEXPREFIXES</item>
+	
+	<!- - keywords with flags: - - >
+	<item>COMPOUNDFLAG</item>
+	<item>COMPOUNDBEGIN</item>
+	<item>COMPOUNDLAST</item>
+	<item>COMPOUNDMIDDLE</item>
+	<item>ONLYINCOMPOUND</item>
+	<item>COMPOUNDPERMITFLAG</item>
+	<item>COMPOUNDFORBIDFLAG</item>
+	<item>COMPOUNDROOT</item>
+	<item>COMPOUNDROOT</item>
+	<item>FORCEUCASE</item>
+	<item>SYLLABLENUM</item>
+	<item>CIRCUMFIX</item>
+	<item>FORBIDDENWORD</item>
+	<item>KEEPCASE</item>
+	<item>LEMMA_PRESENT</item>
+	<item>NEEDAFFIX</item>
+	<!- - PSEUDOROOT is deprecated. (Former name of the NEEDAFFIX option.) - - >
+	<item>SUBSTANDARD</item>
+	<item>NOSUGGEST</item>
+	<item>WARN</item>
+	
+	<!- - keywords with number: - - >
+	<item>MAXCPDSUGS</item>
+	<item>MAXNGRAMSUGS</item>
+	<item>MAXDIFF</item>
+	<item>COMPOUNDMIN</item>
+	<item>COMPOUNDWORDMAX</item>
+	
+	<!- - keywords with number or flags: - - >
+	<item>AF</item>
+	
+</list>
+-->
+
+<list name="list_keywordsWithEnum">
+	<item>SET</item>
+	<item>FLAG</item>
+	<item>LANG</item>
+</list>
+
+<list name="list_keywordsWithCharacters">
+	<item>TRY</item>
+	<item>WORDCHARS</item>
+	<item>IGNORE</item>
+</list>
+
+<list name="list_keywordsWithNumbersOrStrings">
+	<item>BREAK</item>
+	<item>COMPOUNDSYLLABLE</item>
+</list>
+
+<list name="list_keywordsForAffixes">
+	<item>SFX</item>
+	<item>PFX</item>
+</list>
+
+<list name="list_keywordsWithPattern">
+    <!-- TODO Maybe we could implement a special highlighting for each of these pattern types? -->
+	<item>COMPOUNDRULE</item>
+	<item>PHONE</item>
+	<item>ICONV</item>
+	<item>OCONV</item>
+	<item>KEY</item>
+	<item>MAP</item>
+</list>
+
+<contexts>
+
+	<context name="aff" attribute="Undefined" lineEndContext="#stay">
+		<DetectSpaces />
+		<keyword attribute="Keyword" context="context_flag_stripping_affix_condition_morphologicalFields" String="list_keywordsForAffixes" column="0" />
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+		<StringDetect String="REP" insensitive="true" attribute="Keyword" context="context_replace" column="0" /> 
+		<StringDetect String="CHECKCOMPOUNDPATTERN" insensitive="true" attribute="Keyword" context="context_stringsWithFlags" column="0" />
+		<keyword attribute="Keyword" context="context_numbersOrString" String="list_keywordsWithNumbersOrStrings" column="0" />
+		<keyword attribute="Keyword" context="context_characters" String="list_keywordsWithCharacters" column="0" />
+		<keyword attribute="Keyword" context="context_pattern" String="list_keywordsWithPattern" column="0" />
+		<keyword attribute="Keyword" context="context_enum" String="list_keywordsWithEnum" column="0" />
+		<!-- Fallback rule: -->
+		<DetectIdentifier  attribute="Keyword" context="context_numbersOrFlags" column="0" />
+	</context>
+	
+	<context name="context_stringsWithFlags" attribute="String" lineEndContext="#pop">
+		<DetectSpaces />
+		<DetectChar char="/" attribute="Keyword" context="context_stringsWithFlags_flagHelper" />
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+	</context>
+	
+	<context name="context_stringsWithFlags_flagHelper" attribute="Flags" lineEndContext="#pop">
+		<DetectSpaces context="context_stringsWithFlags" />
+	</context>
+	
+	<context name="context_characters" attribute="Characters" lineEndContext="#pop">
+		<DetectSpaces />
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+	</context>
+	
+	<context name="context_enum" attribute="Choice" lineEndContext="#pop">
+		<DetectSpaces />
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+	</context>
+	
+	<context name="context_replace" attribute="Keyword" lineEndContext="#pop">
+		<DetectSpaces />
+		<Int attribute="Number" context="#stay" />
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+		<RegExpr context="context_numbersOrString" attribute="Pattern" String="\S*" />
+	</context>
+	
+	<context name="context_pattern" attribute="Pattern" lineEndContext="#pop">
+		<DetectSpaces />
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+	</context>
+	
+	<context name="context_numbersOrFlags" attribute="Flags" lineEndContext="#pop">
+		<DetectSpaces />
+		<Int attribute="Number" context="#stay" />
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+	</context>
+	
+	<context name="context_numbersOrString" attribute="String" lineEndContext="#pop">
+		<DetectSpaces />
+		<Int attribute="Number" context="#stay" />
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+	</context>
+	
+	<context name="context_flag_stripping_affix_condition_morphologicalFields" attribute="Keyword" lineEndContext="#pop">
+		<DetectSpaces/>
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+		<RegExpr context="context_stripping_affix_condition_morphologicalFields" attribute="Flags" String="\S*" />
+	</context>
+	
+	<context name="context_stripping_affix_condition_morphologicalFields" attribute="Flags" lineEndContext="#pop">
+		<DetectSpaces/>
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+		<DetectChar char="0" attribute="Skipped parameter" context="context_affix_condition_morphologicalFields" />
+		<RegExpr context="context_numbersOrString" attribute="Choice" String="(Y|N)\s*(?![^\d])" />
+		<RegExpr context="context_affix_condition_morphologicalFields" attribute="Stripping" String="\S*" />
+	</context>
+	
+	<context name="context_affix_condition_morphologicalFields" attribute="Stripping" lineEndContext="#pop">
+		<DetectSpaces/>
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+		<RegExpr context="context_slash_flags_condition_morphologicalFields" attribute="Skipped parameter" String="0(?=/)" />
+		<DetectChar char="0" attribute="Skipped parameter" context="context_condition_morphologicalFields" />
+		<RegExpr context="context_slash_flags_condition_morphologicalFields" attribute="Affix" String="[^\s/]*(?=/)" />
+		<DetectChar char="/" context="context_slash_flags_condition_morphologicalFields" lookAhead="true"  />
+		<RegExpr context="context_condition_morphologicalFields" attribute="Affix" String="\S*" />
+	</context>
+	
+	<context name="context_slash_flags_condition_morphologicalFields" attribute="Stripping" lineEndContext="#pop">
+		<DetectChar char="/" attribute="Keyword"  />
+		<RegExpr attribute="Flags" String="\S*" />
+		<DetectSpaces context="context_condition_morphologicalFields" />
+	</context>
+	
+	<context name="context_condition_morphologicalFields" attribute="Stripping" lineEndContext="#pop">
+		<DetectSpaces/>
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+		<RegExpr attribute="Skipped parameter" String="\.(?!\S)" context="context_morphologicalFields" />
+		<RegExpr context="context_notSkippedCondition_morphologicalFields" lookAhead="true" String="\S" />
+	</context>
+	
+	<context name="context_notSkippedCondition_morphologicalFields" attribute="Stripping" lineEndContext="#pop">
+		<RegExpr attribute="Pattern" String="\S*" />
+		<DetectSpaces context="context_morphologicalFields" />
+	</context>
+	
+	<context name="context_morphologicalFields" attribute="Keyword" lineEndContext="#pop">
+		<DetectSpaces/>
+		<DetectChar char="#" attribute="Comment" context="context_comment" />
+		<DetectChar char=":" attribute="itemData2_Keyword" context="context_morphologicalFieldsContent" />
+	</context>
+	
+	<context name="context_morphologicalFieldsContent" attribute="String" lineEndContext="#pop">
+		<DetectSpaces context="context_morphologicalFields" />
+	</context>
+	
+	<context name="context_comment" attribute="Comment" lineEndContext="#pop">
+		<DetectSpaces />
+		<IncludeRules context="##Alerts" />
+		<DetectIdentifier />
+	</context>
+
+</contexts>
+
+
+<itemDatas>
+	<itemData name="Undefined" defStyleNum="dsNormal" />
+	<itemData name="Keyword" defStyleNum="dsKeyword" />
+	<itemData name="Comment" defStyleNum="dsComment" />
+	<itemData name="Number" defStyleNum="dsDecVal" />
+	<itemData name="Stripping" defStyleNum="dsString" />
+	<itemData name="Affix" defStyleNum="dsString" />
+	<itemData name="String" defStyleNum="dsString" />
+	<itemData name="Flags" defStyleNum="dsChar" />
+	<itemData name="Skipped parameter" defStyleNum="dsKeyword" />
+	<itemData name="Pattern" defStyleNum="dsOthers" />
+	<itemData name="Characters" defStyleNum="dsChar" />
+	<itemData name="Choice" defStyleNum="dsDataType" />
+</itemDatas>
+
+</highlighting>
+
+
+<general>
+	<comments>
+		<comment name="singleLine" start="#" />
+	</comments>
+</general>
+
+</language>
diff --git a/kate/data/hunspell-dat.xml b/kate/data/hunspell-dat.xml
new file mode 100644
index 000000000..a57fd589d
--- /dev/null
+++ b/kate/data/hunspell-dat.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd" >
+<language name="Hunspell Thesaurus File" section="Other" extensions="*.dat" priority="-9" version="1" kateversion="2.4" 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>
+
+<contexts>
+
+	<context name="context_dat" fallthrough="true" fallthroughContext="context_content" attribute="Undefined" lineEndContext="context_content" >
+		<RegExpr attribute="Encoding" context="context_content" String=".*" />
+	</context>
+	
+	<context name="context_content" attribute="Entry" lineEndContext="#stay">
+		<DetectChar char="-" attribute="Keyword" column="0" context="context_list" />
+		<DetectChar char="|" attribute="Keyword" context="context_number" />
+	</context>
+	
+	<context name="context_list" attribute="String" lineEndContext="#pop">
+		<DetectChar char="|" attribute="Keyword" context="#stay" />
+		<RangeDetect char="(" char1=")" attribute="Hint" />
+	</context>
+	
+	<context name="context_number" attribute="Number" lineEndContext="#pop">
+	</context>
+
+</contexts>
+
+
+<itemDatas>
+	<itemData name="Undefined" defStyleNum="dsNormal" />
+	<itemData name="Keyword" defStyleNum="dsKeyword" />
+	<itemData name="Number" defStyleNum="dsDecVal" />
+	<itemData name="String" defStyleNum="dsString" />
+	<itemData name="Hint" defStyleNum="dsOthers" />
+	<itemData name="Encoding" defStyleNum="dsDataType" />
+	<itemData name="Entry" defStyleNum="dsFunction" />
+</itemDatas>
+
+</highlighting>
+
+
+<general>
+	<comments>
+		<comment name="singleLine" start="#" />
+	</comments>
+</general>
+
+</language>
diff --git a/kate/data/hunspell-dic.xml b/kate/data/hunspell-dic.xml
new file mode 100644
index 000000000..d714d8dc9
--- /dev/null
+++ b/kate/data/hunspell-dic.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd" >
+<language name="Hunspell Dictionary File" section="Other" extensions="*.dic" priority="-9" version="1" kateversion="2.4" 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>
+
+<list name="list_hyphenKeywords">
+	<item>LEFTHYPHENMIN</item>
+	<item>RIGHTHYPHENMIN</item>
+	<item>COMPOUNDLEFTHYPHENMIN</item>
+	<item>COMPOUNDRIGHTHYPHENMIN</item>
+	<item>NEXTWORD</item>
+	<item>NOHYPHEN</item>
+	<item>NEXTLEVEL</item>
+</list>
+
+<contexts>
+
+	<context name="context_dic" attribute="Undefined" lineEndContext="context_spell" >
+		<!-- detect in the first line wether this is a hyphen dictionary (continue with context_hyphen) or a spell check dictionary (continue with context_spell) -->
+		<Int attribute="Number" context="context_spell" column="0" />
+		<RegExpr attribute="Encoding" context="context_hyphen" String=".*" />
+	</context>
+	
+	<context name="context_hyphen" attribute="String" lineEndContext="#stay">
+		<AnyChar String="0123456789" attribute="Number" context="#stay" />
+		<DetectChar char="." attribute="Keyword" context="#stay" />
+		<DetectChar char="/" attribute="Keyword" context="context_hyphen_parameters" />
+		<AnyChar String="#%" column="0" attribute="Comment" context="context_comment" />
+		<keyword attribute="Keyword" context="#stay" String="list_hyphenKeywords" column="0" />
+	</context>
+	
+	<context name="context_hyphen_parameters" attribute="String" lineEndContext="#pop">
+		<AnyChar String=",=" attribute="Keyword" context="#stay" />
+		<AnyChar String="0123456789" attribute="Number" context="#stay" />
+	</context>
+	
+	<context name="context_spell" attribute="String" lineEndContext="#stay">
+		<DetectChar char="#" column="0" attribute="Comment" context="context_comment" />
+		<DetectChar char="/" attribute="Keyword" context="context_spell_flags" />
+		<DetectSpaces context="context_spell_options" />
+	</context>
+	
+	<context name="context_spell_flags" attribute="Flags" lineEndContext="#pop">
+		<DetectSpaces context="context_spell_options" />
+	</context>
+	
+	<context name="context_spell_options" attribute="Keyword" lineEndContext="#pop">
+		<DetectChar char=":" attribute="Keyword" context="context_spell_parameter" />
+		<DetectChar char="#" column="0" attribute="Comment" context="context_comment" />
+	</context>
+	
+	<context name="context_spell_parameter" attribute="String" lineEndContext="#pop">
+		<DetectSpaces context="#pop" />
+	</context>
+	
+	<context name="context_comment" attribute="Comment" lineEndContext="#pop">
+		<DetectSpaces />
+		<IncludeRules context="##Alerts" />
+		<DetectIdentifier />
+	</context>
+
+</contexts>
+
+
+<itemDatas>
+	<itemData name="Undefined" defStyleNum="dsNormal" />
+	<itemData name="Keyword" defStyleNum="dsKeyword" />
+	<itemData name="Comment" defStyleNum="dsComment" />
+	<itemData name="Number" defStyleNum="dsDecVal" />
+	<itemData name="String" defStyleNum="dsString" />
+	<itemData name="Flags" defStyleNum="dsChar" />
+	<itemData name="Encoding" defStyleNum="dsDataType" />
+</itemDatas>
+
+</highlighting>
+
+
+<general>
+	<comments>
+		<comment name="singleLine" start="#" />
+	</comments>
+</general>
+
+</language>
diff --git a/kate/data/hunspell-idx.xml b/kate/data/hunspell-idx.xml
new file mode 100644
index 000000000..27ba59ace
--- /dev/null
+++ b/kate/data/hunspell-idx.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd" >
+<language name="Hunspell Thesaurus Index File" section="Other" extensions="*.idx" priority="-9" version="1" kateversion="2.3" 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>
+
+<contexts>
+
+	<context name="context_dat" fallthrough="true" fallthroughContext="context_content" attribute="Undefined" lineEndContext="context_content" >
+		<RegExpr attribute="Encoding" context="context_content" String=".*" />
+	</context>
+	
+	<context name="context_content" attribute="Entry" lineEndContext="#stay">
+		<DetectChar char="|" attribute="Keyword" context="context_number" />
+	</context>
+	
+	<context name="context_number" attribute="Number" lineEndContext="#pop">
+	</context>
+
+</contexts>
+
+
+<itemDatas>
+	<itemData name="Undefined" defStyleNum="dsNormal" />
+	<itemData name="Keyword" defStyleNum="dsKeyword" />
+	<itemData name="Number" defStyleNum="dsDecVal" />
+	<itemData name="Encoding" defStyleNum="dsDataType" />
+	<itemData name="Entry" defStyleNum="dsFunction" />
+</itemDatas>
+
+</highlighting>
+
+
+<general>
+	<comments>
+		<comment name="singleLine" start="#" />
+	</comments>
+</general>
+
+</language>
diff --git a/kate/data/idconsole.xml b/kate/data/idconsole.xml
index fa2a5cffd..8732e778c 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.1" section="Scripts" extensions="*.cfg" mimetype="">
+<language name="Quake Script" version="1.02" kateversion="2.2" section="Scripts" extensions="*.cfg" mimetype="">
 
 <highlighting>
 <list name="Commands">
@@ -2074,7 +2074,7 @@
                 <keyword attribute="Command" context="Bind phrase" String="BindFamily"/>
                 <keyword attribute="Command" context="Alias phrase" String="setFamily"/>
                 <keyword attribute="Command" context="Echo" String="PrintsString"/>
-                <StringDetect attribute="Command" context="Alias phrase" String="alias" insensitive="TRUE"/>
+                <StringDetect attribute="Command" context="Alias phrase" String="alias" insensitive="true"/>
                 <keyword attribute="Command" context="Echo" String="PrintsString"/>
                 <DetectChar attribute="Symbol" context="#stay" char="$"/>
                 <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/"/>
diff --git a/kate/data/idl.xml b/kate/data/idl.xml
index d75f6713a..2aad8638a 100644
--- a/kate/data/idl.xml
+++ b/kate/data/idl.xml
@@ -56,7 +56,7 @@
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*"/>
         <AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^{|}~"/>
-        <StringDetect attribute="Comment" context="Some Context3" String="#if 0" insensitive="FALSE"/>
+        <StringDetect attribute="Comment" context="Some Context3" String="#if 0" insensitive="false"/>
         <DetectChar attribute="Preprocessor" context="Preprocessor" char="#" column="0"/>
       </context>
       <context attribute="String" lineEndContext="#stay" name="String">
diff --git a/kate/data/ilerpg.xml b/kate/data/ilerpg.xml
index 92bc7e8a8..ac12be0d9 100644
--- a/kate/data/ilerpg.xml
+++ b/kate/data/ilerpg.xml
@@ -45,7 +45,7 @@
 
 -->
 
-<language name="ILERPG" version="1.05-1" kateversion="2.1" section="Sources" extensions="QRPG*.*;qrpg*.*" mimetype="text/x-ilerpg-src" casesensitive="0">
+<language name="ILERPG" version="1.05-1" kateversion="2.2" section="Sources" extensions="QRPG*.*;qrpg*.*" mimetype="text/x-ilerpg-src" casesensitive="0">
     <highlighting>
     <list name="dkeywords">
 	    <item> EXTPROC </item>
@@ -599,14 +599,14 @@
 	      <Float attribute="Float" context="#stay"/>
 	      <RegExpr attribute="Hex" context="#stay" String="[Xx]'[0-9a-fA-F]{2,}'"/>
 	      <Int attribute="Decimal" context="#stay">
-		      <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-		      <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+		      <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+		      <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+		      <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+		      <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+		      <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+		      <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+		      <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+		      <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
 	      </Int>
       </context>
       
diff --git a/kate/data/inform.xml b/kate/data/inform.xml
index 814ba5a48..933bac058 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.3" section="Sources" extensions="*.inf;*.h" mimetype="text/x-inform-src" author="Giancarlo Niccolai (giancarlo@niccolai.ws)" license="GPL">
+<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">
 <highlighting>
    <list name="keywords">
       <item> if </item>
@@ -284,7 +284,7 @@
 
          <RegExpr String=" *object | *class " attribute="Pragma"
             context="ClassDecl"
-            insensitive="TRUE" beginRegion="reg_class" column="0"/>
+            insensitive="true" beginRegion="reg_class" column="0"/>
 
          <keyword attribute="Pragma" context="#stay" String="pragmas" />
          <keyword attribute="Pragma" context="#stay" String="inline_pragmas" />
@@ -340,7 +340,7 @@
      </context>
 
      <context name="ClassDecl_1" attribute="Normal Text" lineEndContext="#stay">
-         <RegExpr String="^[\t ]*has " attribute="Keyword" context="has_decl" insensitive="TRUE"/>
+         <RegExpr String="^[\t ]*has " attribute="Keyword" context="has_decl" insensitive="true"/>
          <keyword String="ClassDeclOps" attribute="Keyword" context="#stay" />
          <RegExpr String="[a-zA-Z_]+\w*" context = "prop_def"
             attribute="Function"/>
diff --git a/kate/data/ini.xml b/kate/data/ini.xml
index 3cdcd1f20..f6f55e2eb 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" mimetype="" version="1.1" kateversion="2.0" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="1.1" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
 
 <highlighting>
 <list name="keywords">
diff --git a/kate/data/isocpp.xml b/kate/data/isocpp.xml
index 8f1e12e5f..d139522b1 100644
--- a/kate/data/isocpp.xml
+++ b/kate/data/isocpp.xml
@@ -11,7 +11,7 @@
 <language
     name="ISO C++"
     section="Sources"
-    version="2.4-1"
+    version="2.5-1"
     kateversion="2.4"
     indenter="cstyle"
     style="C++"
@@ -466,21 +466,28 @@
       </context>
 
       <context name="AfterHash" attribute="Error" lineEndContext="#pop">
-        <!-- define, elif, else, endif, error, if, ifdef, ifndef, include, include_next, line, pragma, undef, warning -->
+        <RegExpr attribute="Preprocessor" context="Include" String="#\s*(?:include|include_next)" insensitive="true" firstNonSpace="true" />
+
+        <!-- define, elif, else, endif, error, if, ifdef, ifndef, line, pragma, undef, warning -->
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s*if(?:def|ndef)?(?=(?:\(|\s+)\S)" beginRegion="PP" firstNonSpace="true" insensitive="false" />
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" />
         <!-- Switch to seperate context for multiline #defines -->
         <RegExpr attribute="Preprocessor" context="Define" String="(#|%\:|\?\?=)\s*(cmake)?define.*((?=\\))" firstNonSpace="true" lookAhead="true" insensitive="false" />
-        <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s*(?:el(?:se|if)|include(?:_next)?|(cmake)?define|undef|line|error|warning|pragma)" insensitive="false" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s*(?:el(?:se|if)|(cmake)?define|undef|line|error|warning|pragma)" insensitive="false" firstNonSpace="true" />
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="(#|%\:|\?\?=)\s+[0-9]+" firstNonSpace="true" insensitive="false" />
       </context>
 
+      <context attribute="Preprocessor" lineEndContext="#pop" name="Include">
+        <LineContinue attribute="Preprocessor" context="#stay"/>
+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
+        <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
+        <IncludeRules context="Preprocessor" />
+      </context>
+
       <context name="Preprocessor" attribute="Preprocessor" lineEndContext="#pop">
         <LineContinue attribute="Preprocessor" context="#stay" />
         <keyword attribute="Standard Macros" context="#stay" String="StdMacros" />
         <IncludeRules context="GNUMacros##GCCExtensions" />
-        <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;" />
-        <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;" />
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="Comment/Preprocessor" char="/" char1="*" beginRegion="Comment2" />
         <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/" />
diff --git a/kate/data/j.xml b/kate/data/j.xml
new file mode 100644
index 000000000..5393f278a
--- /dev/null
+++ b/kate/data/j.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+  <!ENTITY unum "\d+">                                 <!-- Unsigned integer number -->
+  <!ENTITY anum "[a-z\d]+">                            <!-- Non-10-based unsigned integer number, e.g. 1a -->
+  <!ENTITY bnum "\b&unum;b_?&anum;(\.&anum;)\b">       <!-- Based integer number, e.g. 36b_1a.z2 -->
+  <!ENTITY inum "_?&unum;">                            <!-- Integer number -->
+  <!ENTITY xnum "\b&inum;x\b">                         <!-- Extended precision integer number, e.g. _123x -->
+  <!ENTITY rnum "\b&inum;r&inum;\b">                   <!-- Rational number, e.g. _1r23 -->
+  <!ENTITY fnum "&inum;(\.&unum;)?">                   <!-- Floating point number, e.g. 1.23 -->
+  <!ENTITY enum "(&fnum;(e&inum;)?|_?_|_\.)">          <!-- Exponential (scientific) notation, e.g. 1.2e_3 -->
+  <!ENTITY cnum "&enum;((j|a[dr])&enum;)?">            <!-- Complex number, e.g. 1.2e3j4.5e_6 -->
+  <!ENTITY pnum "\b&cnum;([px]&cnum;)?(?![a-z\d_.])">  <!-- Number based on pi or on e, e.g. 1j2p3j4 -->
+  <!ENTITY name "[a-zA-Z][a-zA-Z\d_]*">                <!-- Name -->
+  <!ENTITY lname "\b&name;_(&name;)?_\b">              <!-- Locative, a__ means a_base_ -->
+  <!ENTITY ilname "\b&name;__&name;\b">                <!-- Indirect locative -->
+]>
+<!--
+  j.xml syntax highlighting for J programming language under Kate
+
+  J is a modern, high-level, general-purpose, high-performance, portable programming language
+  http://www.jsoftware.com
+
+  Kate is a KDE Advanced Text Editor
+  http://kate.kde.org/
+-->
+<language name="J" section="Scripts" version="1.1" kateversion="2.4" extensions="*.ijs;*.IJS" mimetype="text/x-j;text/x-jsrc" author="Igor Zhuravlov (zhuravlov.ip@ya.ru)" indenter="normal" license="GPL">
+  <highlighting>
+    <contexts>
+      <context attribute="Sentence" lineEndContext="#stay" name="sentence">
+        <DetectSpaces/>
+        <StringDetect attribute="Comment" context="comment" String="NB."/>
+        <RegExpr attribute="String" context="#stay" String="&apos;([^&apos;]|&apos;&apos;)*&apos;"/>
+        <RegExpr attribute="Adverb" context="#stay" String="([/\\bfMt]\.|t:|[~/\\}])(?![.:])"/>
+        <RegExpr attribute="Verb" context="#stay" String="(_?\d:|p\.\.|[ACeEIjLor]\.|[_/\\iqsux]:|\{::|[=!\]]|[-&lt;&gt;+*%$|,#{][.:]?|[;[]:?|[~}&quot;ip][.:]|[?^]\.?)(?![.:])"/>
+        <RegExpr attribute="Number" context="#stay" String="&bnum;|&xnum;|&rnum;|&pnum;"/>
+        <AnyChar attribute="Parens" context="#stay" String="()"/>
+        <RegExpr attribute="Conjunction" context="#stay" String="(&quot;|[@&amp;][.:]?|[.:][.:]?|[!D][.:]|&amp;\.:|[;dHT]\.|`:?|[LS^]:)(?![.:])"/>
+        <RegExpr attribute="Control" context="#stay" String="\b(assert|break|f?case|catch[dt]?|continue|do|else(if)?|end|for(_&name;)?|(goto|label)_&name;|if|return|select|throw|try|whil(e|st))\.(?![.:])"/>
+        <Detect2Chars attribute="Copulae Global" context="#stay" char="=" char1=":"/>
+        <Detect2Chars attribute="Copulae Local" context="#stay" char="=" char1="."/>
+        <RegExpr attribute="ExpArg" context="#stay" String="\b[nmuvxy]\.?(?![\w:])"/>
+        <RegExpr attribute="Noun" context="#stay" String="\ba[.:](?![.:])"/>
+      </context>
+      <context attribute="Comment" lineEndContext="#pop" name="comment"/>
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Sentence" defStyleNum="dsNormal"/>
+      <itemData name="Adverb" defStyleNum="dsKeyword" color="#d44"/>
+      <itemData name="Comment" defStyleNum="dsComment" spellChecking="true"/>
+      <itemData name="Conjunction" defStyleNum="dsKeyword" color="#d90"/>
+      <itemData name="Control" defStyleNum="dsKeyword" color="#f00" bold="false"/>
+      <itemData name="Copulae Global" defStyleNum="dsKeyword" color="#a52a2a"/>
+      <itemData name="Copulae Local" defStyleNum="dsKeyword" color="#a020f0" bold="false"/>
+      <itemData name="ExpArg" defStyleNum="dsKeyword" color="#a52a2a" italic="true"/>
+      <itemData name="Noun" defStyleNum="dsKeyword" color="#00f" bold="true"/>
+      <itemData name="Number" defStyleNum="dsDecVal" color="#a020f0"/>
+      <itemData name="Parens" defStyleNum="dsRegionMarker" color="#000"/>
+      <itemData name="String" defStyleNum="dsString" color="#00f"/>
+      <itemData name="Verb" defStyleNum="dsKeyword" color="#096"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="NB."/>
+    </comments>
+  </general>
+</language>
diff --git a/kate/data/jam.xml b/kate/data/jam.xml
index 0b0ebf625..4fe64644b 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.3" kateversion="2.3" section="Other" extensions="Jam*;*.jam" mimetype="text/x-jam;text/x-Jamfile;text/x-Jamrules;text/x-Jambase">
+<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">
   <!--
   Changelog
     0.2
@@ -110,7 +110,7 @@ IN THE SOFTWARE.
         <StringDetect attribute="Keyword" context="OnPreStment" String="on"/>
         <StringDetect attribute="Keyword" context="Rule" String="return"/>
         <StringDetect attribute="Keyword" context="CaseCond" String="case"/>
-        <keyword attribute="Keyword" context="VarAssign" String="keywordLocal"/>
+        <keyword attribute="Keyword" context="#stay" String="keywordLocal"/>
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Operator" context="Block" String="tokenBlockOpen" beginRegion="block" weakDelimiter=":;{}()[].!+,-&lt;=&gt;%&amp;/?^|~\*,"/>
         <RegExpr attribute="VarAssign" context="VarAssign" String="[^\t ]+[\t ]*[\+\?]?=" lookAhead="true"/>
@@ -300,7 +300,7 @@ IN THE SOFTWARE.
         <IncludeRules context="Comment"/>
       </context>
 
-      <context attribute="String" lineEndContext="Error" name="String">
+      <context attribute="String" lineEndContext="#stay" name="String">
         <StringDetect attribute="VariableDelimiter" context="Variable" String="$("/>
         <StringDetect attribute="EscapeSeq" context="#stay" String="\&quot;"/>
         <StringDetect attribute="EscapeSeq" context="#stay" String="\"/>
diff --git a/kate/data/java.xml b/kate/data/java.xml
index 1039ba779..02534508e 100644
--- a/kate/data/java.xml
+++ b/kate/data/java.xml
@@ -3766,7 +3766,7 @@
 				<HlCOct attribute="Octal" context="#stay"/>
 				<HlCHex attribute="Hex" context="#stay"/>
 				<Int attribute="Decimal" context="#stay">
-					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
 				</Int>
 				<HlCChar attribute="Char" context="#stay"/>
 				<RegExpr attribute="Char" context="#stay" String="'\\u[0-9a-fA-F]{4}'"/>
diff --git a/kate/data/javadoc.xml b/kate/data/javadoc.xml
index 2fa40ea91..25eab95e1 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.04" kateversion="2.4" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Javadoc" version="1.05" kateversion="2.4" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<contexts>
 			<context name="Start" attribute="Normal Text" lineEndContext="#stay">
@@ -78,12 +78,12 @@
 				<RegExpr attribute="JavadocParam" context="#pop#pop" String="\S*(?=\*/)" />
 				<RegExpr attribute="JavadocParam" context="#pop" String="\S*(\s|$)" />
 			</context>
-			<context attribute="InlineTag" name="InlineTagar">
+			<context attribute="InlineTag" name="InlineTagar" lineEndContext="#stay">
 				<DetectChar attribute="InlineTag" context="#pop" char="}" />
 				<Detect2Chars attribute="JavadocFS" context="#pop#pop#pop" char="*" char1="/" />
 				<IncludeRules context="##HTML"/>
 			</context>
-			<context attribute="InlineTag" name="LiteralTagar">
+			<context attribute="InlineTag" name="LiteralTagar" lineEndContext="#stay">
 				<DetectChar attribute="InlineTag" context="#pop" char="}" />
 				<Detect2Chars attribute="JavadocFS" context="#pop#pop#pop" char="*" char1="/" />
 			</context>
diff --git a/kate/data/javascript-php.xml b/kate/data/javascript-php.xml
index cd20480e1..3c5305a3a 100644
--- a/kate/data/javascript-php.xml
+++ b/kate/data/javascript-php.xml
@@ -211,7 +211,7 @@
         <DetectIdentifier/>
         <DetectSpaces/>
       </context>
-    <context name="FindPHP">
+    <context name="FindPHP" attribute="Normal Text" lineEndContext="#stay">
 <RegExpr context="##PHP/PHP" String="&lt;\?(?:=|php)?" lookAhead="true" />
 </context>
 </contexts>
diff --git a/kate/data/json.xml b/kate/data/json.xml
index ca03e11c4..d35246ac2 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.3" extensions="*.json" mimetype="application/json" author="Sebastian Pipping (sebastian@pipping.org)" license="GPL">
+<language name="JSON" section="Markup" version="1.3" kateversion="2.4" extensions="*.json" mimetype="application/json" author="Sebastian Pipping (sebastian@pipping.org)" license="GPL">
   <highlighting>
     <list name="Constants">
       <item>null</item>
diff --git a/kate/data/julia.xml b/kate/data/julia.xml
index 685a7a44b..cad27e9d7 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.2" extensions="*.jl" casesensitive="1" priority="5" license="MIT">
+<language name="Julia" section="Sources" version="0.2-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 638cbe828..4cf893a7b 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.1" section="Sources" extensions="*.kbasic" mimetype="text/x-kbasic-src">
+<language name="KBasic" version="1.02" 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
new file mode 100644
index 000000000..a4e8fb041
--- /dev/null
+++ b/kate/data/ld.xml
@@ -0,0 +1,83 @@
+<?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="">
+    <highlighting>
+        <list name="keywords">
+            <item> AT </item>
+            <item> ENTRY </item>
+            <item> INPUT </item>
+            <item> GROUP </item>
+            <item> OUTPUT </item>
+            <item> OUTPUT_ARCH </item>
+            <item> OUTPUT_FORMAT </item>
+            <item> SEARCH_DIR </item>
+            <item> STARTUP </item>
+            <item> TARGET </item>
+        </list>
+        <list name="functions">
+            <item> ABSOLUTE </item>
+            <item> ADDR </item>
+            <item> ALIGN </item>
+            <item> DATA_SEGMENT_ALIGN </item>
+            <item> DATA_SEGMENT_END </item>
+            <item> DATA_SEGMENT_RELRO_END </item>
+            <item> DEFINED </item>
+            <item> LOADADDR </item>
+            <item> MAX </item>
+            <item> MIN </item>
+            <item> NEXT </item>
+            <item> SIZEOF </item>
+            <item> SIZEOF_HEADERS </item>
+        </list>
+        <list name="commands">
+            <item> SECTIONS </item>
+            <item> MEMORY </item>
+        </list>
+        <contexts>
+            <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+                <keyword attribute="Keyword" context="#stay" String="keywords" />
+                <keyword attribute="Function" context="#stay" String="functions" />
+                <keyword attribute="Command" context="#stay" String="commands" />
+                <HlCOct attribute="Number" context="#stay" />
+                <HlCHex attribute="Number" context="#stay" />
+                <!-- Base 10 Integers may be suffixed with K, M or G to indicate size -->
+                <Int attribute="Number" context="#stay">
+                    <StringDetect attribute="Number" context="#stay" String="K" insensitive="true" />
+                    <StringDetect attribute="Number" context="#stay" String="M" insensitive="true" />
+                    <StringDetect attribute="Number" context="#stay" String="G" insensitive="true" />
+                </Int>
+                <RegExpr attribute="Section Name" context="#stay" String="\.[\-_0-9a-zA-Z]+" />
+                <!-- "COMMON" and "/DISCARD/" are special section targets -->
+                <RegExpr attribute="Section Name" context="#stay" String="(COMMON|\/DISCARD\/)" />
+                <DetectChar attribute="Normal Text" context="#stay" char="{" beginRegion="Block" />
+                <DetectChar attribute="Normal Text" context="#stay" char="}" endRegion="Block" />
+                <Detect2Chars attribute="Comment" context="comment" char="/" char1="*" beginRegion="Comment" />
+                <DetectChar attribute="String" context="string" char="&quot;" />
+            </context>
+            <context name="comment" attribute="Comment" lineEndContext="#stay">
+                <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" />
+            </context>
+            <context name="string" attribute="String" lineEndContext="#stay">
+                <DetectChar attribute="String" context="#pop" char="&quot;" />
+            </context>
+        </contexts>
+        <itemDatas>
+            <itemData name="Normal Text" defStyleNum="dsNormal" />
+            <itemData name="Keyword" defStyleNum="dsKeyword" />
+            <itemData name="Function" defStyleNum="dsFunction" />
+            <itemData name="Comment" defStyleNum="dsComment" />
+            <itemData name="Section Name" defStyleNum="dsChar" />
+            <itemData name="Command" defStyleNum="dsKeyword" />
+            <itemData name="Number" defStyleNum="dsBaseN" />
+            <itemData name="String" defStyleNum="dsString" />
+        </itemDatas>
+    </highlighting>
+    <general>
+        <comments>
+            <comment name="multiLine" start="/*" end="*/" region="Comment" />
+            <!-- I don't think GNU LD scripts have single-line comments -->
+        </comments>
+        <keywords casesensitive="1" />
+    </general>
+</language>
diff --git a/kate/data/literate-haskell.xml b/kate/data/literate-haskell.xml
index 6433229fd..c78472468 100644
--- a/kate/data/literate-haskell.xml
+++ b/kate/data/literate-haskell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Literate Haskell" version="2.0.2-1" kateversion="2.3" section="Sources" extensions="*.lhs" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell">
+<language name="Literate Haskell" version="2.1" kateversion="2.3" section="Sources" extensions="*.lhs" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL">
   <highlighting>
   <contexts>
     <context attribute="Text" lineEndContext="#stay" name="text">
diff --git a/kate/data/lsl.xml b/kate/data/lsl.xml
new file mode 100644
index 000000000..391129218
--- /dev/null
+++ b/kate/data/lsl.xml
@@ -0,0 +1,1050 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Linden Scripting Language used in SecondLife and OpenMetaverse -->
+
+<!-- following entities are taken from the original lexer (indra.l) -->
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+  <!ENTITY N "[0-9]">
+  <!ENTITY L "[a-zA-Z_]">
+  <!ENTITY H "[a-fA-F0-9]">
+  <!ENTITY E "[Ee][+-]?&N;+">
+  <!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">
+  <highlighting>
+    <!-- types, keyword, events, constants and symbols are from indra.l -->
+    <list name="types">
+      <item> integer </item>
+      <item> float </item>
+      <item> string </item>
+      <item> key </item>
+      <item> vector </item>
+      <item> quaternion </item>
+      <item> rotation </item>
+      <item> list </item>
+    </list>
+    <list name="keywords">
+      <item> default </item>
+      <item> state </item>
+      <item> event </item>
+      <item> jump </item>
+      <item> return </item>
+      <item> if </item>
+      <item> else </item>
+      <item> for </item>
+      <item> do </item>
+      <item> while </item>
+    </list>
+    <list name="events">
+      <item> state_entry </item>
+      <item> state_exit </item>
+      <item> touch_start </item>
+      <item> touch </item>
+      <item> touch_end </item>
+      <item> collision_start </item>
+      <item> collision </item>
+      <item> collision_end </item>
+      <item> land_collision_start </item>
+      <item> land_collision </item>
+      <item> land_collision_end </item>
+      <item> timer </item>
+      <item> listen </item>
+      <item> sensor </item>
+      <item> no_sensor </item>
+      <item> control </item>
+      <item> print </item>
+      <item> at_target </item>
+      <item> not_at_target </item>
+      <item> at_rot_target </item>
+      <item> not_at_rot_target </item>
+      <item> money </item>
+      <item> email </item>
+      <item> run_time_permissions </item>
+      <item> changed </item>
+      <item> attach </item>
+      <item> dataserver </item>
+      <item> moving_start </item>
+      <item> moving_end </item>
+      <item> link_message </item>
+      <item> on_rez </item>
+      <item> object_rez </item>
+      <item> remote_data </item>
+      <item> http_response </item>
+    </list>
+    <list name="constants">
+      <item> TRUE </item>
+      <item> FALSE </item>
+      <item> STATUS_PHYSICS </item>
+      <item> STATUS_ROTATE_X </item>
+      <item> STATUS_ROTATE_Y </item>
+      <item> STATUS_ROTATE_Z </item>
+      <item> STATUS_PHANTOM </item>
+      <item> STATUS_SANDBOX </item>
+      <item> STATUS_BLOCK_GRAB </item>
+      <item> STATUS_DIE_AT_EDGE </item>
+      <item> STATUS_RETURN_AT_EDGE </item>
+      <item> STATUS_CAST_SHADOWS </item>
+
+      <item> AGENT_FLYING </item>
+      <item> AGENT_ATTACHMENTS </item>
+      <item> AGENT_SCRIPTED </item>
+      <item> AGENT_MOUSELOOK </item>
+      <item> AGENT_SITTING </item>
+      <item> AGENT_ON_OBJECT </item>
+      <item> AGENT_AWAY </item>
+      <item> AGENT_WALKING </item>
+      <item> AGENT_IN_AIR </item>
+      <item> AGENT_TYPING </item>
+      <item> AGENT_CROUCHING </item>
+      <item> AGENT_BUSY </item>
+      <item> AGENT_ALWAYS_RUN </item>
+
+      <item> CAMERA_PITCH </item>
+      <item> CAMERA_FOCUS_OFFSET </item>
+      <item> CAMERA_POSITION_LAG </item>
+      <item> CAMERA_FOCUS_LAG </item>
+      <item> CAMERA_DISTANCE </item>
+      <item> CAMERA_BEHINDNESS_ANGLE </item>
+      <item> CAMERA_BEHINDNESS_LAG </item>
+      <item> CAMERA_POSITION_THRESHOLD </item>
+      <item> CAMERA_FOCUS_THRESHOLD </item>
+      <item> CAMERA_ACTIVE </item>
+      <item> CAMERA_POSITION </item>
+      <item> CAMERA_FOCUS </item>
+      <item> CAMERA_POSITION_LOCKED </item>
+      <item> CAMERA_FOCUS_LOCKED </item>
+
+      <item> ANIM_ON </item>
+      <item> LOOP </item>
+      <item> REVERSE </item>
+      <item> PING_PONG </item>
+      <item> SMOOTH </item>
+      <item> ROTATE </item>
+      <item> SCALE </item>
+
+      <item> ALL_SIDES </item>
+      <item> LINK_ROOT </item>
+      <item> LINK_SET </item>
+      <item> LINK_ALL_OTHERS </item>
+      <item> LINK_ALL_CHILDREN </item>
+      <item> LINK_THIS </item>
+
+      <item> AGENT </item>
+      <item> ACTIVE </item>
+      <item> PASSIVE </item>
+      <item> SCRIPTED </item>
+
+      <item> CONTROL_FWD </item>
+      <item> CONTROL_BACK </item>
+      <item> CONTROL_LEFT </item>
+      <item> CONTROL_RIGHT </item>
+      <item> CONTROL_ROT_LEFT </item>
+      <item> CONTROL_ROT_RIGHT </item>
+      <item> CONTROL_UP </item>
+      <item> CONTROL_DOWN </item>
+      <item> CONTROL_LBUTTON </item>
+      <item> CONTROL_ML_LBUTTON </item>
+
+      <item> PERMISSION_DEBIT </item>
+      <item> PERMISSION_TAKE_CONTROLS </item>
+      <item> PERMISSION_REMAP_CONTROLS </item>
+      <item> PERMISSION_TRIGGER_ANIMATION </item>
+      <item> PERMISSION_ATTACH </item>
+      <item> PERMISSION_RELEASE_OWNERSHIP </item>
+      <item> PERMISSION_CHANGE_LINKS </item>
+      <item> PERMISSION_CHANGE_JOINTS </item>
+      <item> PERMISSION_CHANGE_PERMISSIONS </item>
+      <item> PERMISSION_TRACK_CAMERA </item>
+      <item> PERMISSION_CONTROL_CAMERA </item>
+
+      <item> INVENTORY_TEXTURE </item>
+      <item> INVENTORY_SOUND </item>
+      <item> INVENTORY_OBJECT </item>
+      <item> INVENTORY_SCRIPT </item>
+      <item> INVENTORY_LANDMARK </item>
+      <item> INVENTORY_CLOTHING </item>
+      <item> INVENTORY_NOTECARD </item>
+      <item> INVENTORY_BODYPART </item>
+      <item> INVENTORY_ANIMATION </item>
+      <item> INVENTORY_GESTURE </item>
+      <item> INVENTORY_ALL </item>
+      <item> INVENTORY_NONE </item>
+
+      <item> CHANGED_INVENTORY </item>
+      <item> CHANGED_COLOR </item>
+      <item> CHANGED_SHAPE </item>
+      <item> CHANGED_SCALE </item>
+      <item> CHANGED_TEXTURE </item>
+      <item> CHANGED_LINK </item>
+      <item> CHANGED_ALLOWED_DROP </item>
+      <item> CHANGED_OWNER </item>
+      <item> CHANGED_REGION </item>
+      <item> CHANGED_TELEPORT </item>
+
+      <item> OBJECT_UNKNOWN_DETAIL </item>
+      <item> OBJECT_NAME </item>
+      <item> OBJECT_DESC </item>
+      <item> OBJECT_POS </item>
+      <item> OBJECT_ROT </item>
+      <item> OBJECT_VELOCITY </item>
+      <item> OBJECT_OWNER </item>
+      <item> OBJECT_GROUP </item>
+      <item> OBJECT_CREATOR </item>
+
+      <item> TYPE_INTEGER </item>
+      <item> TYPE_FLOAT </item>
+      <item> TYPE_STRING </item>
+      <item> TYPE_KEY </item>
+      <item> TYPE_VECTOR </item>
+      <item> TYPE_ROTATION </item>
+      <item> TYPE_INVALID </item>
+
+      <item> NULL_KEY </item>
+      <item> EOF </item>
+
+      <item> PI </item>
+      <item> TWO_PI </item>
+      <item> PI_BY_TWO </item>
+      <item> DEG_TO_RAD </item>
+      <item> RAD_TO_DEG </item>
+      <item> SQRT2 </item>
+
+      <item> DEBUG_CHANNEL </item>
+      <item> PUBLIC_CHANNEL </item>
+
+      <item> ZERO_VECTOR </item>
+      <item> ZERO_ROTATION </item>
+
+      <item> ATTACH_CHEST </item>
+      <item> ATTACH_HEAD </item>
+      <item> ATTACH_LSHOULDER </item>
+      <item> ATTACH_RSHOULDER </item>
+      <item> ATTACH_LHAND </item>
+      <item> ATTACH_RHAND </item>
+      <item> ATTACH_LFOOT </item>
+      <item> ATTACH_RFOOT </item>
+      <item> ATTACH_BACK </item>
+      <item> ATTACH_PELVIS </item>
+      <item> ATTACH_MOUTH </item>
+      <item> ATTACH_CHIN </item>
+      <item> ATTACH_LEAR </item>
+      <item> ATTACH_REAR </item>
+      <item> ATTACH_LEYE </item>
+      <item> ATTACH_REYE </item>
+      <item> ATTACH_NOSE </item>
+      <item> ATTACH_RUARM </item>
+      <item> ATTACH_RLARM </item>
+      <item> ATTACH_LUARM </item>
+      <item> ATTACH_LLARM </item>
+      <item> ATTACH_RHIP </item>
+      <item> ATTACH_RULEG </item>
+      <item> ATTACH_RLLEG </item>
+      <item> ATTACH_LHIP </item>
+      <item> ATTACH_LULEG </item>
+      <item> ATTACH_LLLEG </item>
+      <item> ATTACH_BELLY </item>
+      <item> ATTACH_LPEC </item>
+      <item> ATTACH_RPEC </item>
+      <item> ATTACH_HUD_CENTER_2 </item>
+      <item> ATTACH_HUD_TOP_RIGHT </item>
+      <item> ATTACH_HUD_TOP_CENTER </item>
+      <item> ATTACH_HUD_TOP_LEFT </item>
+      <item> ATTACH_HUD_CENTER_1 </item>
+      <item> ATTACH_HUD_BOTTOM_LEFT </item>
+      <item> ATTACH_HUD_BOTTOM </item>
+      <item> ATTACH_HUD_BOTTOM_RIGHT </item>
+
+      <item> LAND_LEVEL </item>
+      <item> LAND_RAISE </item>
+      <item> LAND_LOWER </item>
+      <item> LAND_SMOOTH </item>
+      <item> LAND_NOISE </item>
+      <item> LAND_REVERT </item>
+
+      <item> LAND_SMALL_BRUSH </item>
+      <item> LAND_MEDIUM_BRUSH </item>
+      <item> LAND_LARGE_BRUSH </item>
+
+      <item> DATA_ONLINE </item>
+      <item> DATA_NAME </item>
+      <item> DATA_BORN </item>
+      <item> DATA_RATING </item>
+      <item> DATA_SIM_POS </item>
+      <item> DATA_SIM_STATUS </item>
+      <item> DATA_SIM_RATING </item>
+      <item> DATA_PAYINFO </item>
+
+      <item> PAYMENT_INFO_ON_FILE </item>
+      <item> PAYMENT_INFO_USED </item>
+
+      <item> REMOTE_DATA_CHANNEL </item>
+      <item> REMOTE_DATA_REQUEST </item>
+      <item> REMOTE_DATA_REPLY </item>
+
+
+      <item> PSYS_PART_FLAGS </item>
+      <item> PSYS_PART_START_COLOR </item>
+      <item> PSYS_PART_START_ALPHA </item>
+      <item> PSYS_PART_START_SCALE </item>
+      <item> PSYS_PART_END_COLOR </item>
+      <item> PSYS_PART_END_ALPHA </item>
+      <item> PSYS_PART_END_SCALE </item>
+      <item> PSYS_PART_MAX_AGE </item>
+
+
+      <item> PSYS_PART_WIND_MASK </item>
+      <item> PSYS_PART_INTERP_COLOR_MASK </item>
+      <item> PSYS_PART_INTERP_SCALE_MASK </item>
+      <item> PSYS_PART_BOUNCE_MASK </item>
+      <item> PSYS_PART_FOLLOW_SRC_MASK </item>
+      <item> PSYS_PART_FOLLOW_VELOCITY_MASK </item>
+      <item> PSYS_PART_TARGET_POS_MASK </item>
+      <item> PSYS_PART_EMISSIVE_MASK </item>
+      <item> PSYS_PART_TARGET_LINEAR_MASK </item>
+
+
+      <item> PSYS_SRC_MAX_AGE </item>
+      <item> PSYS_SRC_PATTERN </item>
+      <item> PSYS_SRC_INNERANGLE </item>
+      <item> PSYS_SRC_OUTERANGLE </item>
+      <item> PSYS_SRC_ANGLE_BEGIN </item>
+      <item> PSYS_SRC_ANGLE_END </item>
+      <item> PSYS_SRC_BURST_RATE </item>
+      <item> PSYS_SRC_BURST_PART_COUNT </item>
+      <item> PSYS_SRC_BURST_RADIUS </item>
+      <item> PSYS_SRC_BURST_SPEED_MIN </item>
+      <item> PSYS_SRC_BURST_SPEED_MAX </item>
+      <item> PSYS_SRC_ACCEL </item>
+      <item> PSYS_SRC_TEXTURE </item>
+      <item> PSYS_SRC_TARGET_KEY </item>
+      <item> PSYS_SRC_OMEGA </item>
+
+      <item> PSYS_SRC_OBJ_REL_MASK </item>
+
+      <item> PSYS_SRC_PATTERN_DROP </item>
+      <item> PSYS_SRC_PATTERN_EXPLODE </item>
+      <item> PSYS_SRC_PATTERN_ANGLE </item>
+      <item> PSYS_SRC_PATTERN_ANGLE_CONE </item>
+      <item> PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY </item>
+
+
+      <item> VEHICLE_TYPE_NONE </item>
+      <item> VEHICLE_TYPE_SLED </item>
+      <item> VEHICLE_TYPE_CAR </item>
+      <item> VEHICLE_TYPE_BOAT </item>
+      <item> VEHICLE_TYPE_AIRPLANE </item>
+      <item> VEHICLE_TYPE_BALLOON </item>
+
+      <item> VEHICLE_REFERENCE_FRAME </item>
+      <item> VEHICLE_LINEAR_FRICTION_TIMESCALE </item>
+      <item> VEHICLE_ANGULAR_FRICTION_TIMESCALE </item>
+      <item> VEHICLE_LINEAR_MOTOR_DIRECTION </item>
+      <item> VEHICLE_ANGULAR_MOTOR_DIRECTION </item>
+      <item> VEHICLE_LINEAR_MOTOR_OFFSET </item>
+
+
+
+      <item> VEHICLE_HOVER_HEIGHT </item>
+      <item> VEHICLE_HOVER_EFFICIENCY </item>
+      <item> VEHICLE_HOVER_TIMESCALE </item>
+      <item> VEHICLE_BUOYANCY </item>
+
+      <item> VEHICLE_LINEAR_DEFLECTION_EFFICIENCY </item>
+      <item> VEHICLE_LINEAR_DEFLECTION_TIMESCALE </item>
+      <item> VEHICLE_LINEAR_MOTOR_TIMESCALE </item>
+      <item> VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE </item>
+
+      <item> VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY </item>
+      <item> VEHICLE_ANGULAR_DEFLECTION_TIMESCALE </item>
+      <item> VEHICLE_ANGULAR_MOTOR_TIMESCALE </item>
+      <item> VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE </item>
+
+      <item> VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY </item>
+      <item> VEHICLE_VERTICAL_ATTRACTION_TIMESCALE </item>
+
+      <item> VEHICLE_BANKING_EFFICIENCY </item>
+      <item> VEHICLE_BANKING_MIX </item>
+      <item> VEHICLE_BANKING_TIMESCALE </item>
+
+      <item> VEHICLE_FLAG_NO_FLY_UP </item>
+      <item> VEHICLE_FLAG_NO_DEFLECTION_UP </item>
+      <item> VEHICLE_FLAG_LIMIT_ROLL_ONLY </item>
+      <item> VEHICLE_FLAG_HOVER_WATER_ONLY </item>
+      <item> VEHICLE_FLAG_HOVER_TERRAIN_ONLY </item>
+      <item> VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT </item>
+      <item> VEHICLE_FLAG_HOVER_UP_ONLY </item>
+      <item> VEHICLE_FLAG_LIMIT_MOTOR_UP </item>
+      <item> VEHICLE_FLAG_MOUSELOOK_STEER </item>
+      <item> VEHICLE_FLAG_MOUSELOOK_BANK </item>
+      <item> VEHICLE_FLAG_CAMERA_DECOUPLED </item>
+
+
+
+      <item> PRIM_TYPE </item>
+      <item> PRIM_MATERIAL </item>
+      <item> PRIM_PHYSICS </item>
+      <item> PRIM_FLEXIBLE </item>
+      <item> PRIM_POINT_LIGHT </item>
+      <item> PRIM_TEMP_ON_REZ </item>
+      <item> PRIM_PHANTOM </item>
+      <item> PRIM_CAST_SHADOWS </item>
+      <item> PRIM_POSITION </item>
+      <item> PRIM_SIZE </item>
+      <item> PRIM_ROTATION </item>
+      <item> PRIM_TEXTURE </item>
+      <item> PRIM_COLOR </item>
+      <item> PRIM_BUMP_SHINY </item>
+      <item> PRIM_FULLBRIGHT </item>
+      <item> PRIM_TEXGEN </item>
+      <item> PRIM_GLOW </item>
+
+      <item> PRIM_TYPE_BOX </item>
+      <item> PRIM_TYPE_CYLINDER </item>
+      <item> PRIM_TYPE_PRISM </item>
+      <item> PRIM_TYPE_SPHERE </item>
+      <item> PRIM_TYPE_TORUS </item>
+      <item> PRIM_TYPE_TUBE </item>
+      <item> PRIM_TYPE_RING </item>
+      <item> PRIM_TYPE_SCULPT </item>
+
+      <item> PRIM_HOLE_DEFAULT </item>
+      <item> PRIM_HOLE_CIRCLE </item>
+      <item> PRIM_HOLE_SQUARE </item>
+      <item> PRIM_HOLE_TRIANGLE </item>
+
+      <item> PRIM_MATERIAL_STONE </item>
+      <item> PRIM_MATERIAL_METAL </item>
+      <item> PRIM_MATERIAL_GLASS </item>
+      <item> PRIM_MATERIAL_WOOD </item>
+      <item> PRIM_MATERIAL_FLESH </item>
+      <item> PRIM_MATERIAL_PLASTIC </item>
+      <item> PRIM_MATERIAL_RUBBER </item>
+      <item> PRIM_MATERIAL_LIGHT </item>
+
+      <item> PRIM_SHINY_NONE </item>
+      <item> PRIM_SHINY_LOW </item>
+      <item> PRIM_SHINY_MEDIUM </item>
+      <item> PRIM_SHINY_HIGH </item>
+
+      <item> PRIM_BUMP_NONE </item>
+      <item> PRIM_BUMP_BRIGHT </item>
+      <item> PRIM_BUMP_DARK </item>
+      <item> PRIM_BUMP_WOOD </item>
+      <item> PRIM_BUMP_BARK </item>
+      <item> PRIM_BUMP_BRICKS </item>
+      <item> PRIM_BUMP_CHECKER </item>
+      <item> PRIM_BUMP_CONCRETE </item>
+      <item> PRIM_BUMP_TILE </item>
+      <item> PRIM_BUMP_STONE </item>
+      <item> PRIM_BUMP_DISKS </item>
+      <item> PRIM_BUMP_GRAVEL </item>
+      <item> PRIM_BUMP_BLOBS </item>
+      <item> PRIM_BUMP_SIDING </item>
+      <item> PRIM_BUMP_LARGETILE </item>
+      <item> PRIM_BUMP_STUCCO </item>
+      <item> PRIM_BUMP_SUCTION </item>
+      <item> PRIM_BUMP_WEAVE </item>
+
+      <item> PRIM_TEXGEN_DEFAULT </item>
+      <item> PRIM_TEXGEN_PLANAR </item>
+
+      <item> PRIM_SCULPT_TYPE_SPHERE </item>
+      <item> PRIM_SCULPT_TYPE_TORUS </item>
+      <item> PRIM_SCULPT_TYPE_PLANE </item>
+      <item> PRIM_SCULPT_TYPE_CYLINDER </item>
+      <item> PRIM_SCULPT_TYPE_MASK </item>
+      <item> PRIM_SCULPT_FLAG_MIRROR </item>
+      <item> PRIM_SCULPT_FLAG_INVERT </item>
+
+      <item> MASK_BASE </item>
+      <item> MASK_OWNER </item>
+      <item> MASK_GROUP </item>
+      <item> MASK_EVERYONE </item>
+      <item> MASK_NEXT </item>
+
+      <item> PERM_TRANSFER </item>
+      <item> PERM_MODIFY </item>
+      <item> PERM_COPY </item>
+      <item> PERM_MOVE </item>
+      <item> PERM_ALL </item>
+
+      <item> PARCEL_MEDIA_COMMAND_STOP </item>
+      <item> PARCEL_MEDIA_COMMAND_PAUSE </item>
+      <item> PARCEL_MEDIA_COMMAND_PLAY </item>
+      <item> PARCEL_MEDIA_COMMAND_LOOP </item>
+      <item> PARCEL_MEDIA_COMMAND_TEXTURE </item>
+      <item> PARCEL_MEDIA_COMMAND_URL </item>
+      <item> PARCEL_MEDIA_COMMAND_TIME </item>
+      <item> PARCEL_MEDIA_COMMAND_AGENT </item>
+      <item> PARCEL_MEDIA_COMMAND_UNLOAD </item>
+      <item> PARCEL_MEDIA_COMMAND_AUTO_ALIGN </item>
+      <item> PARCEL_MEDIA_COMMAND_TYPE </item>
+      <item> PARCEL_MEDIA_COMMAND_SIZE </item>
+      <item> PARCEL_MEDIA_COMMAND_DESC </item>
+      <item> PARCEL_MEDIA_COMMAND_LOOP_SET </item>
+
+      <item> LIST_STAT_MAX </item>
+      <item> LIST_STAT_MIN </item>
+      <item> LIST_STAT_MEAN </item>
+      <item> LIST_STAT_MEDIAN </item>
+      <item> LIST_STAT_STD_DEV </item>
+      <item> LIST_STAT_SUM </item>
+      <item> LIST_STAT_SUM_SQUARES </item>
+      <item> LIST_STAT_NUM_COUNT </item>
+      <item> LIST_STAT_GEOMETRIC_MEAN </item>
+      <item> LIST_STAT_RANGE </item>
+
+      <item> PAY_HIDE </item>
+      <item> PAY_DEFAULT </item>
+
+      <item> PARCEL_FLAG_ALLOW_FLY </item>
+      <item> PARCEL_FLAG_ALLOW_GROUP_SCRIPTS </item>
+      <item> PARCEL_FLAG_ALLOW_SCRIPTS </item>
+      <item> PARCEL_FLAG_ALLOW_LANDMARK </item>
+      <item> PARCEL_FLAG_ALLOW_TERRAFORM </item>
+      <item> PARCEL_FLAG_ALLOW_DAMAGE </item>
+      <item> PARCEL_FLAG_ALLOW_CREATE_OBJECTS </item>
+      <item> PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS </item>
+      <item> PARCEL_FLAG_USE_ACCESS_GROUP </item>
+      <item> PARCEL_FLAG_USE_ACCESS_LIST </item>
+      <item> PARCEL_FLAG_USE_BAN_LIST </item>
+      <item> PARCEL_FLAG_USE_LAND_PASS_LIST </item>
+      <item> PARCEL_FLAG_LOCAL_SOUND_ONLY </item>
+      <item> PARCEL_FLAG_RESTRICT_PUSHOBJECT </item>
+      <item> PARCEL_FLAG_ALLOW_GROUP_OBJECT_ENTRY </item>
+      <item> PARCEL_FLAG_ALLOW_ALL_OBJECT_ENTRY </item>
+
+      <item> REGION_FLAG_ALLOW_DAMAGE </item>
+      <item> REGION_FLAG_FIXED_SUN </item>
+      <item> REGION_FLAG_BLOCK_TERRAFORM </item>
+      <item> REGION_FLAG_SANDBOX </item>
+      <item> REGION_FLAG_DISABLE_COLLISIONS </item>
+      <item> REGION_FLAG_DISABLE_PHYSICS </item>
+      <item> REGION_FLAG_BLOCK_FLY </item>
+      <item> REGION_FLAG_ALLOW_DIRECT_TELEPORT </item>
+      <item> REGION_FLAG_RESTRICT_PUSHOBJECT </item>
+
+      <item> HTTP_METHOD </item>
+      <item> HTTP_MIMETYPE </item>
+      <item> HTTP_BODY_MAXLENGTH </item>
+      <item> HTTP_BODY_TRUNCATED </item>
+      <item> HTTP_VERIFY_CERT </item>
+
+      <item> PARCEL_COUNT_TOTAL </item>
+      <item> PARCEL_COUNT_OWNER </item>
+      <item> PARCEL_COUNT_GROUP </item>
+      <item> PARCEL_COUNT_OTHER </item>
+      <item> PARCEL_COUNT_SELECTED </item>
+      <item> PARCEL_COUNT_TEMP </item>
+
+      <item> PARCEL_DETAILS_NAME </item>
+      <item> PARCEL_DETAILS_DESC </item>
+      <item> PARCEL_DETAILS_OWNER </item>
+      <item> PARCEL_DETAILS_GROUP </item>
+      <item> PARCEL_DETAILS_AREA </item>
+
+      <item> STRING_TRIM_HEAD </item>
+      <item> STRING_TRIM_TAIL </item>
+      <item> STRING_TRIM </item>
+
+      <item> CLICK_ACTION_NONE </item>
+      <item> CLICK_ACTION_TOUCH </item>
+      <item> CLICK_ACTION_SIT </item>
+      <item> CLICK_ACTION_BUY </item>
+      <item> CLICK_ACTION_PAY </item>
+      <item> CLICK_ACTION_OPEN </item>
+      <item> CLICK_ACTION_PLAY </item>
+      <item> CLICK_ACTION_OPEN_MEDIA </item>
+
+      <item> TEXTURE_BLANK </item>
+      <item> TEXTURE_DEFAULT </item>
+      <item> TEXTURE_MEDIA </item>
+      <item> TEXTURE_PLYWOOD </item>
+      <item> TEXTURE_TRANSPARENT </item>
+
+      <item> TOUCH_INVALID_FACE </item>
+      <item> TOUCH_INVALID_VECTOR </item>
+      <item> TOUCH_INVALID_TEXCOORD </item>
+    </list>
+    <list name="symbols">
+      <item> ++ </item>
+      <item> -- </item>
+      <item> += </item>
+      <item> -= </item>
+      <item> *= </item>
+      <item> /= </item>
+      <item> %= </item>
+      <item> ; </item>
+      <item> , </item>
+      <item> = </item>
+      <item> ( </item>
+      <item> ) </item>
+      <item> - </item>
+      <item> + </item>
+      <item> * </item>
+      <item> / </item>
+      <item> % </item>
+      <item> @ </item>
+      <item> : </item>
+      <item> &gt; </item>
+      <item> &lt; </item>
+      <item> == </item>
+      <item> != </item>
+      <item> &gt;= </item>
+      <item> &lt;= </item>
+      <item> &amp; </item>
+      <item> | </item>
+      <item> ^ </item>
+      <item> ~ </item>
+      <item> ! </item>
+      <item> &amp;&amp; </item>
+      <item> || </item>
+      <item> &lt;&lt; </item>
+      <item> &gt;&gt; </item>
+    </list>
+
+    <!-- stdlib is taken from lscript_library.cpp -->
+    <list name="stdlib">
+      <item> llSin </item>
+      <item> llCos </item>
+      <item> llTan </item>
+      <item> llAtan2 </item>
+      <item> llSqrt </item>
+      <item> llPow </item>
+      <item> llAbs </item>
+      <item> llFabs </item>
+      <item> llFrand </item>
+      <item> llFloor </item>
+      <item> llCeil </item>
+      <item> llRound </item>
+      <item> llVecMag </item>
+      <item> llVecNorm </item>
+      <item> llVecDist </item>
+      <item> llRot2Euler </item>
+      <item> llEuler2Rot </item>
+      <item> llAxes2Rot </item>
+      <item> llRot2Fwd </item>
+      <item> llRot2Left </item>
+      <item> llRot2Up </item>
+      <item> llRotBetween </item>
+      <item> llWhisper </item>
+      <item> llSay </item>
+      <item> llShout </item>
+      <item> llListen </item>
+      <item> llListenControl </item>
+      <item> llListenRemove </item>
+      <item> llSensor </item>
+      <item> llSensorRepeat </item>
+      <item> llSensorRemove </item>
+      <item> llDetectedName </item>
+      <item> llDetectedKey </item>
+      <item> llDetectedOwner </item>
+      <item> llDetectedType </item>
+      <item> llDetectedPos </item>
+      <item> llDetectedVel </item>
+      <item> llDetectedGrab </item>
+      <item> llDetectedRot </item>
+      <item> llDetectedGroup </item>
+      <item> llDetectedLinkNumber </item>
+      <item> llDie </item>
+      <item> llGround </item>
+      <item> llCloud </item>
+      <item> llWind </item>
+      <item> llSetStatus </item>
+      <item> llGetStatus </item>
+      <item> llSetScale </item>
+      <item> llGetScale </item>
+      <item> llSetColor </item>
+      <item> llGetAlpha </item>
+      <item> llSetAlpha </item>
+      <item> llGetColor </item>
+      <item> llSetTexture </item>
+      <item> llScaleTexture </item>
+      <item> llOffsetTexture </item>
+      <item> llRotateTexture </item>
+      <item> llGetTexture </item>
+      <item> llSetPos </item>
+      <item> llGetPos </item>
+      <item> llGetLocalPos </item>
+      <item> llSetRot </item>
+      <item> llGetRot </item>
+      <item> llGetLocalRot </item>
+      <item> llSetForce </item>
+      <item> llGetForce </item>
+      <item> llTarget </item>
+      <item> llTargetRemove </item>
+      <item> llRotTarget </item>
+      <item> llRotTargetRemove </item>
+      <item> llMoveToTarget </item>
+      <item> llStopMoveToTarget </item>
+      <item> llApplyImpulse </item>
+      <item> llApplyRotationalImpulse </item>
+      <item> llSetTorque </item>
+      <item> llGetTorque </item>
+      <item> llSetForceAndTorque </item>
+      <item> llGetVel </item>
+      <item> llGetAccel </item>
+      <item> llGetOmega </item>
+      <item> llGetTimeOfDay </item>
+      <item> llGetWallclock </item>
+      <item> llGetTime </item>
+      <item> llResetTime </item>
+      <item> llGetAndResetTime </item>
+      <item> llSound </item>
+      <item> llPlaySound </item>
+      <item> llLoopSound </item>
+      <item> llLoopSoundMaster </item>
+      <item> llLoopSoundSlave </item>
+      <item> llPlaySoundSlave </item>
+      <item> llTriggerSound </item>
+      <item> llStopSound </item>
+      <item> llPreloadSound </item>
+      <item> llGetSubString </item>
+      <item> llDeleteSubString </item>
+      <item> llInsertString </item>
+      <item> llToUpper </item>
+      <item> llToLower </item>
+      <item> llGiveMoney </item>
+      <item> llMakeExplosion </item>
+      <item> llMakeFountain </item>
+      <item> llMakeSmoke </item>
+      <item> llMakeFire </item>
+      <item> llRezObject </item>
+      <item> llLookAt </item>
+      <item> llStopLookAt </item>
+      <item> llSetTimerEvent </item>
+      <item> llSleep </item>
+      <item> llGetMass </item>
+      <item> llCollisionFilter </item>
+      <item> llTakeControls </item>
+      <item> llReleaseControls </item>
+      <item> llAttachToAvatar </item>
+      <item> llDetachFromAvatar </item>
+      <item> llTakeCamera </item>
+      <item> llReleaseCamera </item>
+      <item> llGetOwner </item>
+      <item> llInstantMessage </item>
+      <item> llEmail </item>
+      <item> llGetNextEmail </item>
+      <item> llGetKey </item>
+      <item> llSetBuoyancy </item>
+      <item> llSetHoverHeight </item>
+      <item> llStopHover </item>
+      <item> llMinEventDelay </item>
+      <item> llSoundPreload </item>
+      <item> llRotLookAt </item>
+      <item> llStringLength </item>
+      <item> llStartAnimation </item>
+      <item> llStopAnimation </item>
+      <item> llPointAt </item>
+      <item> llStopPointAt </item>
+      <item> llTargetOmega </item>
+      <item> llGetStartParameter </item>
+      <item> llGodLikeRezObject </item>
+      <item> llRequestPermissions </item>
+      <item> llGetPermissionsKey </item>
+      <item> llGetPermissions </item>
+      <item> llGetLinkNumber </item>
+      <item> llSetLinkColor </item>
+      <item> llCreateLink </item>
+      <item> llBreakLink </item>
+      <item> llBreakAllLinks </item>
+      <item> llGetLinkKey </item>
+      <item> llGetLinkName </item>
+      <item> llGetInventoryNumber </item>
+      <item> llGetInventoryName </item>
+      <item> llSetScriptState </item>
+      <item> llGetEnergy </item>
+      <item> llGiveInventory </item>
+      <item> llRemoveInventory </item>
+      <item> llSetText </item>
+      <item> llWater </item>
+      <item> llPassTouches </item>
+      <item> llRequestAgentData </item>
+      <item> llRequestInventoryData </item>
+      <item> llSetDamage </item>
+      <item> llTeleportAgentHome </item>
+      <item> llModifyLand </item>
+      <item> llCollisionSound </item>
+      <item> llCollisionSprite </item>
+      <item> llGetAnimation </item>
+      <item> llResetScript </item>
+      <item> llMessageLinked </item>
+      <item> llPushObject </item>
+      <item> llPassCollisions </item>
+      <item> llGetScriptName </item>
+      <item> llGetNumberOfSides </item>
+      <item> llAxisAngle2Rot </item>
+      <item> llRot2Axis </item>
+      <item> llRot2Angle </item>
+      <item> llAcos </item>
+      <item> llAsin </item>
+      <item> llAngleBetween </item>
+      <item> llGetInventoryKey </item>
+      <item> llAllowInventoryDrop </item>
+      <item> llGetSunDirection </item>
+      <item> llGetTextureOffset </item>
+      <item> llGetTextureScale </item>
+      <item> llGetTextureRot </item>
+      <item> llSubStringIndex </item>
+      <item> llGetOwnerKey </item>
+      <item> llGetCenterOfMass </item>
+      <item> llListSort </item>
+      <item> llGetListLength </item>
+      <item> llList2Integer </item>
+      <item> llList2Float </item>
+      <item> llList2String </item>
+      <item> llList2Key </item>
+      <item> llList2Vector </item>
+      <item> llList2Rot </item>
+      <item> llList2List </item>
+      <item> llDeleteSubList </item>
+      <item> llGetListEntryType </item>
+      <item> llList2CSV </item>
+      <item> llCSV2List </item>
+      <item> llListRandomize </item>
+      <item> llList2ListStrided </item>
+      <item> llGetRegionCorner </item>
+      <item> llListInsertList </item>
+      <item> llListFindList </item>
+      <item> llGetObjectName </item>
+      <item> llSetObjectName </item>
+      <item> llGetDate </item>
+      <item> llEdgeOfWorld </item>
+      <item> llGetAgentInfo </item>
+      <item> llAdjustSoundVolume </item>
+      <item> llSetSoundQueueing </item>
+      <item> llSetSoundRadius </item>
+      <item> llKey2Name </item>
+      <item> llSetTextureAnim </item>
+      <item> llTriggerSoundLimited </item>
+      <item> llEjectFromLand </item>
+      <item> llParseString2List </item>
+      <item> llOverMyLand </item>
+      <item> llGetLandOwnerAt </item>
+      <item> llGetNotecardLine </item>
+      <item> llGetAgentSize </item>
+      <item> llSameGroup </item>
+      <item> llUnSit </item>
+      <item> llGroundSlope </item>
+      <item> llGroundNormal </item>
+      <item> llGroundContour </item>
+      <item> llGetAttached </item>
+      <item> llGetFreeMemory </item>
+      <item> llGetRegionName </item>
+      <item> llGetRegionTimeDilation </item>
+      <item> llGetRegionFPS </item>
+
+      <item> llParticleSystem </item>
+      <item> llGroundRepel </item>
+      <item> llGiveInventoryList </item>
+
+      <item> llSetVehicleType </item>
+      <item> llSetVehicleFloatParam </item>
+      <item> llSetVehicleVectorParam </item>
+      <item> llSetVehicleRotationParam </item>
+      <item> llSetVehicleFlags </item>
+      <item> llRemoveVehicleFlags </item>
+      <item> llSitTarget </item>
+      <item> llAvatarOnSitTarget </item>
+      <item> llAddToLandPassList </item>
+      <item> llSetTouchText </item>
+      <item> llSetSitText </item>
+      <item> llSetCameraEyeOffset </item>
+      <item> llSetCameraAtOffset </item>
+
+      <item> llDumpList2String </item>
+      <item> llScriptDanger </item>
+      <item> llDialog </item>
+      <item> llVolumeDetect </item>
+      <item> llResetOtherScript </item>
+      <item> llGetScriptState </item>
+      <item> llRemoteLoadScript </item>
+
+      <item> llSetRemoteScriptAccessPin </item>
+      <item> llRemoteLoadScriptPin </item>
+
+      <item> llOpenRemoteDataChannel </item>
+      <item> llSendRemoteData </item>
+      <item> llRemoteDataReply </item>
+      <item> llCloseRemoteDataChannel </item>
+
+      <item> llMD5String </item>
+      <item> llSetPrimitiveParams </item>
+      <item> llStringToBase64 </item>
+      <item> llBase64ToString </item>
+      <item> llXorBase64Strings </item>
+      <item> llRemoteDataSetRegion </item>
+      <item> llLog10 </item>
+      <item> llLog </item>
+      <item> llGetAnimationList </item>
+      <item> llSetParcelMusicURL </item>
+
+      <item> llGetRootPosition </item>
+      <item> llGetRootRotation </item>
+
+      <item> llGetObjectDesc </item>
+      <item> llSetObjectDesc </item>
+      <item> llGetCreator </item>
+      <item> llGetTimestamp </item>
+      <item> llSetLinkAlpha </item>
+      <item> llGetNumberOfPrims </item>
+      <item> llGetNumberOfNotecardLines </item>
+
+      <item> llGetBoundingBox </item>
+      <item> llGetGeometricCenter </item>
+      <item> llGetPrimitiveParams </item>
+      <item> llIntegerToBase64 </item>
+      <item> llBase64ToInteger </item>
+      <item> llGetGMTclock </item>
+      <item> llGetSimulatorHostname </item>
+
+      <item> llSetLocalRot </item>
+
+      <item> llParseStringKeepNulls </item>
+      <item> llRezAtRoot </item>
+
+      <item> llGetObjectPermMask </item>
+      <item> llSetObjectPermMask </item>
+
+      <item> llGetInventoryPermMask </item>
+      <item> llSetInventoryPermMask </item>
+      <item> llGetInventoryCreator </item>
+      <item> llOwnerSay </item>
+      <item> llRequestSimulatorData </item>
+      <item> llForceMouselook </item>
+      <item> llGetObjectMass </item>
+      <item> llListReplaceList </item>
+      <item> llLoadURL </item>
+
+      <item> llParcelMediaCommandList </item>
+      <item> llParcelMediaQuery </item>
+
+      <item> llModPow </item>
+
+      <item> llGetInventoryType </item>
+      <item> llSetPayPrice </item>
+      <item> llGetCameraPos </item>
+      <item> llGetCameraRot </item>
+
+      <item> llSetPrimURL </item>
+      <item> llRefreshPrimURL </item>
+      <item> llEscapeURL </item>
+      <item> llUnescapeURL </item>
+
+      <item> llMapDestination </item>
+      <item> llAddToLandBanList </item>
+      <item> llRemoveFromLandPassList </item>
+      <item> llRemoveFromLandBanList </item>
+
+      <item> llSetCameraParams </item>
+      <item> llClearCameraParams </item>
+
+      <item> llListStatistics </item>
+      <item> llGetUnixTime </item>
+      <item> llGetParcelFlags </item>
+      <item> llGetRegionFlags </item>
+      <item> llXorBase64StringsCorrect </item>
+
+      <item> llHTTPRequest </item>
+
+      <item> llResetLandBanList </item>
+      <item> llResetLandPassList </item>
+
+      <item> llGetObjectPrimCount </item>
+      <item> llGetParcelPrimOwners </item>
+      <item> llGetParcelPrimCount </item>
+      <item> llGetParcelMaxPrims </item>
+      <item> llGetParcelDetails </item>
+
+      <item> llSetLinkPrimitiveParams </item>
+      <item> llSetLinkTexture </item>
+
+
+      <item> llStringTrim </item>
+      <item> llRegionSay </item>
+      <item> llGetObjectDetails </item>
+      <item> llSetClickAction </item>
+
+      <item> llGetRegionAgentCount </item>
+      <item> llTextBox </item>
+      <item> llGetAgentLanguage </item>
+      <item> llDetectedTouchUV </item>
+      <item> llDetectedTouchFace </item>
+      <item> llDetectedTouchPos </item>
+      <item> llDetectedTouchNormal </item>
+      <item> llDetectedTouchBinormal </item>
+      <item> llDetectedTouchST </item>
+
+      <item> llSHA1String </item>
+    </list>
+
+    <!-- for added convenience -->
+    <list name="attention">
+      <item>FIXME</item>
+      <item>TODO</item>
+      <item>BUG</item>
+      <item>HACK</item>
+      <item>XXX</item>
+    </list>
+    <contexts>
+      <context name="Default" attribute="Normal Text" lineEndContext="#stay">
+        <!-- all regexps here are based on indra.l -->
+        <Detect2Chars  char="/" char1="/" context="Comment"/>
+        <keyword attribute="Data Type" String="types"/>
+        <keyword attribute="Keyword" String="keywords"/>
+        <keyword attribute="Event" String="events"/>
+        <RegExpr attribute="Hex" String="0[xX]&H;+"/>
+        <RegExpr attribute="Decimal" String="&N;+"/>
+        <keyword attribute="Constant" String="constants"/>
+        <keyword attribute="Library Function" String="stdlib"/>
+        <RegExpr attribute="Function" String="&L;(&L;|&N;)*(?=\s*\()"/>
+        <RegExpr attribute="Identifier" String="&L;(&L;|&N;)*"/>
+        <RegExpr attribute="Float" String="&N;+&E;"/>
+        <RegExpr attribute="Float" String="&N;*\.&N;+(&E;)?&FS;?"/>
+        <RegExpr attribute="Float" String="&N;+\.&N;*(&E;)?&FS;?"/>
+        <RegExpr attribute="String" String="&L;?\&quot;(\\.|[^\\&quot;])*\&quot;"/>
+        <keyword attribute="Symbol" String="symbols"/>
+        <DetectChar char="." attribute="Symbol"/>
+        <DetectChar char="{" attribute="Brace" beginRegion="brace"/>
+        <DetectChar char="}" attribute="Brace" endRegion="brace"/>
+
+        <!-- the following allows folding multiline function calls and lists, very handy -->
+        <DetectChar char="(" attribute="Symbol" beginRegion="paren"/>
+        <DetectChar char=")" attribute="Symbol" endRegion="paren"/>
+        <DetectChar char="[" attribute="Symbol" beginRegion="list"/>
+        <DetectChar char="]" attribute="Symbol" endRegion="list"/>
+      </context>
+      <context name="Comment" attribute="Comment" lineEndContext="#pop">
+        <keyword attribute="Alert" String="attention"/>
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Data Type" defStyleNum="dsDataType"/>
+      <itemData name="Keyword" defStyleNum="dsKeyword"/>
+      <itemData name="Event" defStyleNum="dsOthers"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
+      <itemData name="Hex" defStyleNum="dsBaseN"/>
+      <itemData name="Decimal" defStyleNum="dsDecVal"/>
+      <itemData name="Constant" defStyleNum="dsOthers"/>
+      <itemData name="Identifier" defStyleNum="dsNormal"/>
+      <itemData name="Float" defStyleNum="dsFloat"/>
+      <itemData name="String" defStyleNum="dsString"/>
+      <itemData name="Symbol" defStyleNum="dsNormal"/>
+      <itemData name="Brace" defStyleNum="dsNormal"/>
+      <itemData name="Library Function" defStyleNum="dsFunction" bold="1"/>
+      <itemData name="Function" defStyleNum="dsFunction"/>
+      <itemData name="Alert" defStyleNum="dsAlert"/>
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+        <comment name="singleLine" position="afterwhitespace" start="//"/>
+    </comments>
+  </general>
+</language>
+<!--
+// kate: space-indent on; indent-width 2; replace-tabs on;
+-->
diff --git a/kate/data/m3u.xml b/kate/data/m3u.xml
index cc1099650..b3ee4cae3 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.0" author="Jan Janssen (medhefgo@web.de)" license="LGPL" >
+<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" >
 
 <highlighting>
 <contexts>
diff --git a/kate/data/mako.xml b/kate/data/mako.xml
index 09bba3c93..4cb3d725e 100644
--- a/kate/data/mako.xml
+++ b/kate/data/mako.xml
@@ -57,21 +57,21 @@
 		<StringDetect attribute="CDATA" context="CDATA" String="&lt;![CDATA[" beginRegion="cdata" />
 		<RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" beginRegion="doctype" />
 		<RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:-]*" beginRegion="pi" />
-		<RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="TRUE" beginRegion="style" />
-		<RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="TRUE" beginRegion="script" />
-		<RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="TRUE" beginRegion="pre" />
-		<RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="TRUE" beginRegion="div" />
-		<RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="TRUE" beginRegion="table" />
-		<RegExpr attribute="Element" context="El Open" String="&lt;ul\b" insensitive="TRUE" beginRegion="ul" />
-		<RegExpr attribute="Element" context="El Open" String="&lt;ol\b" insensitive="TRUE" beginRegion="ol" />
-		<RegExpr attribute="Element" context="El Open" String="&lt;dl\b" insensitive="TRUE" beginRegion="dl" />
+		<RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="true" beginRegion="style" />
+		<RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="true" beginRegion="script" />
+		<RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="true" beginRegion="pre" />
+		<RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="true" beginRegion="div" />
+		<RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="true" beginRegion="table" />
+		<RegExpr attribute="Element" context="El Open" String="&lt;ul\b" insensitive="true" beginRegion="ul" />
+		<RegExpr attribute="Element" context="El Open" String="&lt;ol\b" insensitive="true" beginRegion="ol" />
+		<RegExpr attribute="Element" context="El Open" String="&lt;dl\b" insensitive="true" beginRegion="dl" />
 		<RegExpr attribute="Element" context="El Open" String="&lt;&name;" />
-		<RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="TRUE" endRegion="pre" />
-		<RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="TRUE" endRegion="div" />
-		<RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="TRUE" endRegion="table" />
-		<RegExpr attribute="Element" context="El Close" String="&lt;/ul\b" insensitive="TRUE" endRegion="ul" />
-		<RegExpr attribute="Element" context="El Close" String="&lt;/ol\b" insensitive="TRUE" endRegion="ol" />
-		<RegExpr attribute="Element" context="El Close" String="&lt;/dl\b" insensitive="TRUE" endRegion="dl" />
+		<RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="true" endRegion="pre" />
+		<RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="true" endRegion="div" />
+		<RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="true" endRegion="table" />
+		<RegExpr attribute="Element" context="El Close" String="&lt;/ul\b" insensitive="true" endRegion="ul" />
+		<RegExpr attribute="Element" context="El Close" String="&lt;/ol\b" insensitive="true" endRegion="ol" />
+		<RegExpr attribute="Element" context="El Close" String="&lt;/dl\b" insensitive="true" endRegion="dl" />
 		<RegExpr attribute="Element" context="El Close" String="&lt;/&name;" />
 		<!-- as long as kde gives DTDs the text/html mimetype--><IncludeRules context="FindDTDRules" />
 		<IncludeRules context="FindEntityRefs" />
@@ -176,7 +176,7 @@
 	</context>
 
 	<context name="CSS content" attribute="Normal Text" lineEndContext="#stay">
-		<RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="TRUE" endRegion="style" />
+		<RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="true" endRegion="style" />
 		<IncludeRules context="##CSS" includeAttrib="true"/>
 	</context>
 
@@ -188,15 +188,15 @@
 	</context>
 
 	<context name="JS content" attribute="Normal Text" lineEndContext="#stay">
-		<RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
-		<RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
+		<RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="true" endRegion="script" />
+		<RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="true" />
 		<RegExpr attribute="MakoKeyword" context="NoMakoJS" String="&lt;%text(?:\s+[^&gt;]*)?&gt;" beginRegion="nomako" />
 		<IncludeRules context="FindMako" />
 		<IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
 	</context>
 
 	<context name="JS comment close" attribute="Comment" lineEndContext="#pop">
-		<RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
+		<RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="true" endRegion="script" />
 		<IncludeRules context="##Alerts" />
 	</context>
 
diff --git a/kate/data/mandoc.xml b/kate/data/mandoc.xml
new file mode 100644
index 000000000..ba388d05e
--- /dev/null
+++ b/kate/data/mandoc.xml
@@ -0,0 +1,89 @@
+<?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">
+
+  <highlighting>
+
+    <list name="headings">
+      <item>SH</item>
+      <item>SS</item>
+      <item>TH</item>
+    </list>
+
+    <list name="paragraph">
+      <item>HP</item>
+      <item>IP</item>
+      <item>LP</item>
+      <item>P</item>
+      <item>PD</item>
+      <item>PP</item>
+      <item>RE</item>
+      <item>RS</item>
+      <item>TP</item>
+    </list>
+
+    <list name="formatting">
+      <item>B</item>
+      <item>BI</item>
+      <item>BR</item>
+      <item>I</item>
+      <item>IB</item>
+      <item>IR</item>
+      <item>RB</item>
+      <item>RI</item>
+      <item>SM</item>
+      <item>SB</item>
+    </list>
+
+    <list name="others">
+      <item>DT</item>
+    </list>
+
+    <contexts>
+
+      <!-- root context -->
+      <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+        <IncludeRules context="DetectComments##Roff"/>
+        <DetectChar attribute="Macros" context="DetectDirective" char="." column="0"/>
+        <IncludeRules context="DetectOthers##Roff"/>
+      </context>
+
+      <!-- directive start -->
+      <context name="DetectDirective" attribute="Macros" lineEndContext="#pop">
+        <keyword attribute="Headings" context="Directive" String="headings"/>
+        <keyword attribute="Paragraphs" context="Directive" String="paragraph"/>
+        <keyword attribute="Formatting" context="Directive" String="formatting"/>
+        <keyword attribute="Other Macros" context="Directive" String="others"/>
+        <IncludeRules context="DetectDirective##Roff"/>
+      </context>
+
+      <context name="Directive" attribute="Identifier" lineEndContext="#pop">
+        <IncludeRules context="Directive##Roff"/>
+      </context>
+
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Normal Text"    defStyleNum="dsNormal"/>
+      <itemData name="Comment"        defStyleNum="dsComment"/>
+      <itemData name="Macros"         defStyleNum="dsFunction"/>
+      <itemData name="Headings"       defStyleNum="dsKeyword"/>
+      <itemData name="Paragraphs"     defStyleNum="dsDataType"/>
+      <itemData name="Formatting"     defStyleNum="dsKeyword"/>
+      <itemData name="Other Macros"   defStyleNum="dsFunction"/>
+      <itemData name="Identifier"     defStyleNum="dsString"/>
+    </itemDatas>
+
+  </highlighting>
+
+  <general>
+
+    <comments>
+      <comment name="singleLine" start=".\&quot;" />
+    </comments>
+
+    <keywords casesensitive="1"/>
+
+  </general>
+
+</language>
diff --git a/kate/data/mason.xml b/kate/data/mason.xml
index cf7b30952..c67b8516d 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.1" name="Mason" section="Scripts" extensions="*.html;" mimetype="">
+<language version="1.06" kateversion="2.4" name="Mason" section="Scripts" extensions="*.html;" mimetype="">
 <highlighting>
 	<list name="keywords">
 		<item> sub </item>
@@ -70,19 +70,19 @@
 		<context  attribute="HTML" lineEndContext="#stay" name="HTML">
 			<RegExpr attribute="Mason Tag" context="EmbeddedPerl" String="&lt;\%method[^&gt;]*&gt;" />
 			<RegExpr attribute="Mason Tag" context="EmbeddedPerl" String="&lt;\%def[^&gt;]*&gt;" />
-			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%method&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Comment" context="Documentation" String="&lt;%doc&gt;" insensitive="FALSE" />
+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%method&gt;" insensitive="false" />
+			<StringDetect attribute="Comment" context="Documentation" String="&lt;%doc&gt;" insensitive="false" />
 
-			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%perl&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%init&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%once&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%args&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%filter&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%cleanup&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%flags&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%attr&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%shared&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="UnparsedText" String="&lt;%text&gt;" insensitive="FALSE" />
+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%perl&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%init&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%once&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%args&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%filter&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%cleanup&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%flags&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%attr&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="EmbeddedPerl" String="&lt;%shared&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="UnparsedText" String="&lt;%text&gt;" insensitive="false" />
 			<Detect2Chars attribute="Mason Tag" context="EmbeddedPerl" char="&lt;" char1="%" />
 			<Detect2Chars attribute="Mason Method" context="MethodCall" char="&lt;" char1="&amp;" />
 			<StringDetect attribute="Mason Tag" context="#stay" String="&lt;/&amp;&gt;" />
@@ -91,17 +91,17 @@
 
 		<context attribute="normal" lineEndContext="#stay" name="EmbeddedPerl">
 			<Detect2Chars attribute="Mason Tag" context="#pop" char="%" char1="&gt;" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%perl&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%method&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%def&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%init&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%once&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%args&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%filter&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%cleanup&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%flags&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%attr&gt;" insensitive="FALSE" />
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%shared&gt;" insensitive="FALSE" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%perl&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%method&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%def&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%init&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%once&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%args&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%filter&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%cleanup&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%flags&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%attr&gt;" insensitive="false" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%shared&gt;" insensitive="false" />
 			<keyword attribute="Keyword" context="#stay" String="keywords"/>
 			<keyword attribute="Data Type" context="#stay" String="types"/>
 			<HlCOct attribute="Octal" context="#stay"/>
@@ -133,7 +133,7 @@
 		</context>
 		
 		<context attribute="String" lineEndContext="#stay" name="UnparsedText">
-			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%text&gt;" insensitive="FALSE" />
+			<StringDetect attribute="Mason Tag" context="#pop" String="&lt;/%text&gt;" insensitive="false" />
 		</context>
 		
 		<context attribute="Data Type" lineEndContext="#pop" name="Variable">
@@ -199,7 +199,7 @@
 		</context>
 
 		<context attribute="Comment" lineEndContext="#stay" name="Documentation">
-			<StringDetect attribute="Comment" context="#pop" String="&lt;/%doc&gt;" insensitive="FALSE" />
+			<StringDetect attribute="Comment" context="#pop" String="&lt;/%doc&gt;" insensitive="false" />
 		</context>
 
 		<context attribute="Mason Method" lineEndContext="#stay" name="MethodCall">
diff --git a/kate/data/mathematica.xml b/kate/data/mathematica.xml
index 880ac54b8..050a09bc6 100644
--- a/kate/data/mathematica.xml
+++ b/kate/data/mathematica.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Mathematica" version="8.0.4" kateversion="2.4" section="Scientific" extensions="*.nb" indenter="cstyle"
+<language name="Mathematica" version="8.1" kateversion="2.4" section="Scientific" extensions="*.nb" indenter="cstyle"
           author="Sven Brauch (svenbrauch@gmail.com)" license="LGPL" priority="3">
   <highlighting>
     <list name="functions">
diff --git a/kate/data/maxima.xml b/kate/data/maxima.xml
index cbf765794..e7be7e2eb 100644
--- a/kate/data/maxima.xml
+++ b/kate/data/maxima.xml
@@ -21,7 +21,7 @@
 
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="Maxima" version="0.16-2" kateversion="2.0" section="Scientific" extensions="*.mac;*.MAC;*.dem;*.DEM" casesensitive="1" author="Alexey Beshenov &lt;al@beshenov.ru>" license="LGPL">
+<language name="Maxima" version="0.17-1" kateversion="2.0" section="Scientific" extensions="*.mac;*.MAC;*.dem;*.DEM" casesensitive="1" author="Alexey Beshenov &lt;al@beshenov.ru>" license="LGPL">
     <highlighting>
 
         <list name="MaximaKeyword">
@@ -1867,14 +1867,14 @@
         <itemDatas>
             <itemData name="Normal Text" defStyleNum="dsNormal" color="#000"/>
             <itemData name="Keyword" defStyleNum="dsKeyword" bold="true" color="#000"/>
-            <itemData name="Variable" italic="true" color="#336"/>
+            <itemData name="Variable" defStyleNum="dsVariable" italic="true" color="#336"/>
             <itemData name="String" defStyleNum="dsString" color="#c00"/>
             <itemData name="Function" defStyleNum="dsFunction" color="#066"/>
             <itemData name="Integer" defStyleNum="dsDecVal" color="#00c"/>
             <itemData name="Float" defStyleNum="dsFloat" color="#606"/>
-            <itemData name="Comment" color="#666"/>
-            <itemData name="Quote" color="#00c" bold="true"/>
-            <itemData name="Special" color="#c00" bold="true" />
+            <itemData name="Comment" defStyleNum="dsComment" color="#666"/>
+            <itemData name="Quote" defStyleNum="dsComment" color="#00c" bold="true"/>
+            <itemData name="Special" defStyleNum="dsSpecialString" color="#c00" bold="true" />
         </itemDatas>
 
     </highlighting>
diff --git a/kate/data/mergetagtext.xml b/kate/data/mergetagtext.xml
index 83b14a31b..e7da98bc4 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.5" section="Configuration" author="Diggory Hardy (diggory.hardy@gmail.com)" license="LGPL" extensions="*.mtt;">
+<language name="mergetag text" version="0.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/metafont.xml b/kate/data/metafont.xml
new file mode 100644
index 000000000..74538db73
--- /dev/null
+++ b/kate/data/metafont.xml
@@ -0,0 +1,1009 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+The lists of keywords of this file are borrowed from the VIM syntax 
+files mp.vim and mf.vim
+We have moved some keywords for consistency
+-->
+
+<!DOCTYPE language SYSTEM "language.dtd">
+<language name="Metapost/Metafont" section="Markup" version="0.9" kateversion="2.4"
+extensions="*.mp;*.mps;*.mpost;*.mf" mimetype="text/x-metapost" 
+author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
+  <highlighting>
+    <!--Here are some listing from mf.vim-->
+    <!--Metafont 'primitives' as defined in chapter 25 of 'The METAFONTbook'-->
+    <!--Page 210: 'boolean expressions'-->
+    <list name="mfBoolExp">
+      <item>true</item>
+
+      <item>false</item>
+      <item>known</item>
+      <item>unknown</item>
+      <item>odd</item>
+      <item>charexists</item>
+      <item>not</item>
+
+      <item>and</item>
+      <item>or</item>
+    </list>
+
+    <!--Page 210: 'numeric expression'-->
+    <list name="mfNumExp">
+      <item>normaldeviate</item>
+      <item>length</item>
+
+      <item>ASCII</item>
+      <item>oct</item>
+      <item>hex</item>
+      <item>angle</item>
+      <item>turningnumber</item>
+      <item>totalweight</item>
+
+      <item>directiontime</item>
+      <item>xpart</item>
+      <item>ypart</item>
+      <item>xxpart</item>
+      <item>xypart</item>
+      <item>yxpart</item>
+
+      <item>yypart</item>
+      <item>sqrt</item>
+      <item>sind</item>
+      <item>cosd</item>
+      <item>mlog</item>
+      <item>mexp</item>
+
+      <item>floor</item>
+      <item>uniformdeviate</item>
+      <item>abs</item>
+      <item>div</item>
+      <item>dotprod</item>
+      <item>max</item>
+
+      <item>min</item>
+      <item>mod</item>
+      <item>ceiling</item>
+    </list>
+
+    <!--Page 211: 'internal quantities'-->
+    <list name="mfInternal">
+      <item>tracingtitles</item>
+
+      <item>tracingequations</item>
+      <item>tracingcapsules</item>
+      <item>tracingchoices</item>
+      <item>tracingspecs</item>
+      <item>tracingpens</item>
+      <item>tracingcommands</item>
+
+      <item>tracingrestores</item>
+      <item>tracingmacros</item>
+      <item>tracingedges</item>
+      <item>tracingoutput</item>
+      <item>tracingonline</item>
+      <item>tracingstats</item>
+
+      <item>pausing</item>
+      <item>showstopping</item>
+      <item>fontmaking</item>
+      <item>proofing</item>
+      <item>turningcheck</item>
+      <item>warningcheck</item>
+
+      <item>smoothing</item>
+      <item>autorounding</item>
+      <item>granularity</item>
+      <item>fillin</item>
+      <item>year</item>
+      <item>month</item>
+
+      <item>day</item>
+      <item>time</item>
+      <item>charcode</item>
+      <item>charext</item>
+      <item>charwd</item>
+      <item>charht</item>
+
+      <item>chardp</item>
+      <item>charic</item>
+      <item>chardx</item>
+      <item>chardy</item>
+      <item>designsize</item>
+      <item>hppp</item>
+
+      <item>vppp</item>
+      <item>xoffset</item>
+      <item>yoffset</item>
+      <item>boundarychar</item>
+    </list>
+
+    <!--Page 212: 'pair expressions'-->
+
+    <list name="mfPairExp">
+      <item>point</item>
+      <item>of</item>
+      <item>precontrol</item>
+      <item>postcontrol</item>
+      <item>penoffset</item>
+
+      <item>rotated</item>
+      <item>scaled</item>
+      <item>shifted</item>
+      <item>slanted</item>
+      <item>transformed</item>
+      <item>xscaled</item>
+
+      <item>yscaled</item>
+      <item>zscaled</item>
+    </list>
+
+    <!--Page 213: 'path expressions'-->
+    <list name="mfPathExp">
+      <item>makepath</item>
+      <item>reverse</item>
+
+      <item>subpath</item>
+      <item>curl</item>
+      <item>tension</item>
+      <item>atleast</item>
+      <item>controls</item>
+      <item>cycle</item>
+
+    </list>
+
+    <!--Page 214: 'pen expressions'-->
+    <list name="mfPenExp">
+      <item>nullpen</item>
+      <item>pencircle</item>
+      <item>makepen</item>
+    </list>
+
+    <!--Page 214: 'picture expressions'-->
+    <list name="mfPicExp">
+      <item>nullpicture</item>
+    </list>
+
+    <!--Page 214: 'string expressions'-->
+    <list name="mfStringExp">
+      <item>jobname</item>
+
+      <item>readstring</item>
+      <item>str</item>
+      <item>char</item>
+      <item>decimal</item>
+      <item>substring</item>
+    </list>
+
+    <!--Page 217: 'commands and statements'-->
+    <list name="mfCommand">
+      <item>end</item>
+      <item>dump</item>
+      <item>save</item>
+      <item>interim</item>
+
+      <item>newinternal</item>
+      <item>randomseed</item>
+      <item>let</item>
+      <item>delimiters</item>
+      <item>outer</item>
+      <item>everyjob</item>
+
+      <item>show</item>
+      <item>showvariable</item>
+      <item>showtoken</item>
+      <item>showdependencies</item>
+      <item>showstats</item>
+      <item>message</item>
+
+      <item>errmessage</item>
+      <item>errhelp</item>
+      <item>batchmode</item>
+      <item>nonstopmode</item>
+      <item>scrollmode</item>
+      <item>errorstopmode</item>
+
+      <item>addto</item>
+      <item>also</item>
+      <item>contour</item>
+      <item>doublepath</item>
+      <item>withpen</item>
+      <item>withweight</item>
+
+      <item>cull</item>
+      <item>keeping</item>
+      <item>dropping</item>
+      <item>display</item>
+      <item>inwindow</item>
+      <item>openwindow</item>
+
+      <item>at</item>
+      <item>from</item>
+      <item>to</item>
+      <item>shipout</item>
+      <item>special</item>
+      <item>numspecial</item>
+
+    </list>
+
+    <!--Page 56: 'types'-->
+    <list name="mfType">
+      <item>boolean</item>
+      <item>numeric</item>
+      <item>pair</item>
+      <item>path</item>
+
+      <item>pen</item>
+      <item>picture</item>
+      <item>string</item>
+      <item>transform</item>
+    </list>
+
+    <!--Page 155: 'grouping'-->
+
+<!--     <list name="mfStatement"> -->
+<!--       <item>begingroup</item> -->
+<!--       <item>endgroup</item> -->
+<!--     </list> -->
+
+    <!--Page 165: 'definitions'-->
+    <list name="mfDefinition">
+<!--       <item>enddef</item> -->
+<!--       <item>def</item> -->
+      <item>expr</item>
+      <item>suffix</item>
+
+      <item>text</item>
+      <item>primary</item>
+      <item>secondary</item>
+      <item>tertiary</item>
+<!--       <item>vardef</item> -->
+      <item>primarydef</item>
+      <item>secondarydef</item>
+
+      <item>tertiarydef</item>
+    </list>
+
+    <!--Page 169: 'conditions and loops'-->
+    <list name="mfCondition">
+<!--       <item>if</item> -->
+<!--       <item>fi</item> -->
+      <item>else</item>
+      <item>elseif</item>
+
+<!--       <item>endfor</item> -->
+<!--       <item>for</item> -->
+<!--       <item>forsuffixes</item> -->
+<!--       <item>forever</item> -->
+      <item>step</item>
+      <item>until</item>
+      <item>upto</item>
+      <item>exitif</item>
+    </list>
+
+    <!--Other primitives listed in the index-->
+    <list name="mfPrimitive">
+      <item>charlist</item>
+      <item>endinput</item>
+      <item>expandafter</item>
+      <item>extensible</item>
+
+      <item>fontdimen</item>
+      <item>headerbyte</item>
+      <item>inner</item>
+      <item>input</item>
+      <item>intersectiontimes</item>
+      <item>kern</item>
+
+      <item>ligtable</item>
+      <item>quote</item>
+      <item>scantokens</item>
+      <item>skipto</item>
+    </list>
+
+    <!--Keywords defined by plain.mf-->
+
+    <list name="mfMacro">
+<!--       <item>abs</item> -->
+      <item>addto_currentpicture</item>
+      <item>aspect_ratio</item>
+      <item>base_name</item>
+      <item>base_version</item>
+<!--       <item>beginchar</item> -->
+      <item>blacker</item>
+
+      <item>blankpicture</item>
+      <item>bot</item>
+      <item>bye</item>
+      <item>byte</item>
+      <item>capsule_def</item>
+<!--       <item>ceiling</item> -->
+      <item>change_width</item>
+
+      <item>clear_pen_memory</item>
+      <item>clearit</item>
+      <item>clearpen</item>
+      <item>clearxy</item>
+      <item>counterclockwise</item>
+      <item>culldraw</item>
+
+      <item>cullit</item>
+      <item>currentpen</item>
+      <item>currentpen_path</item>
+      <item>currentpicture</item>
+      <item>currenttransform</item>
+      <item>currentwindow</item>
+
+      <item>cutdraw</item>
+      <item>cutoff</item>
+      <item>d</item>
+      <item>decr</item>
+      <item>define_blacker_pixels</item>
+      <item>define_corrected_pixels</item>
+
+      <item>define_good_x_pixels</item>
+      <item>define_good_y_pixels</item>
+      <item>define_horizontal_corrected_pixels</item>
+      <item>define_pixels</item>
+      <item>define_whole_blacker_pixels</item>
+      <item>define_whole_pixels</item>
+
+      <item>define_whole_vertical_blacker_pixels</item>
+      <item>define_whole_vertical_pixels</item>
+      <item>dir</item>
+      <item>direction</item>
+      <item>directionpoint</item>
+      <item>displaying</item>
+
+      <item>ditto</item>
+<!--       <item>div</item> -->
+<!--       <item>dotprod</item> -->
+      <item>down</item>
+      <item>downto</item>
+      <item>draw</item>
+      <item>drawdot</item>
+
+<!--       <item>endchar</item> -->
+      <item>eps</item>
+      <item>epsilon</item>
+<!--       <item>extra_beginchar</item> -->
+<!--       <item>extra_endchar</item> -->
+      <item>extra_setup</item>
+      <item>erase</item>
+      <item>exitunless</item>
+
+      <item>fill</item>
+      <item>filldraw</item>
+      <item>fix_units</item>
+      <item>flex</item>
+      <item>font_coding_scheme</item>
+      <item>font_extra_space</item>
+
+      <item>font_identifier</item>
+      <item>font_normal_shrink</item>
+      <item>font_normal_space</item>
+      <item>font_normal_stretch</item>
+      <item>font_quad</item>
+      <item>font_setup</item>
+
+      <item>font_size</item>
+      <item>font_slant</item>
+      <item>font_x_height</item>
+      <item>fullcircle</item>
+      <item>generate</item>
+      <item>gfcorners</item>
+
+      <item>gobble</item>
+      <item>gobbled</item>
+      <item>grayfont</item>
+      <item>h</item>
+      <item>halfcircle</item>
+      <item>hide</item>
+
+      <item>hround</item>
+      <item>identity</item>
+      <item>image_rules</item>
+      <item>incr</item>
+      <item>infinity</item>
+      <item>interact</item>
+
+      <item>interpath</item>
+      <item>intersectionpoint</item>
+      <item>inverse</item>
+      <item>italcorr</item>
+      <item>join_radius</item>
+      <item>killtext</item>
+
+      <item>labelfont</item>
+      <item>labels</item>
+      <item>left</item>
+      <item>lft</item>
+      <item>localfont</item>
+      <item>loggingall</item>
+
+      <item>lowres</item>
+      <item>lowres_fix</item>
+      <item>mag</item>
+      <item>magstep</item>
+      <item>makebox</item>
+      <item>makegrid</item>
+
+      <item>makelabel</item>
+      <item>maketicks</item>
+<!--       <item>max</item> -->
+<!--       <item>min</item> -->
+<!--       <item>mod</item> -->
+      <item>mode</item>
+      <item>mode_def</item>
+      <item>mode_name</item>
+
+      <item>mode_setup</item>
+      <item>nodisplays</item>
+      <item>notransforms</item>
+      <item>number_of_modes</item>
+      <item>numtok</item>
+      <item>o_correction</item>
+
+      <item>openit</item>
+      <item>origin</item>
+      <item>pen_bot</item>
+      <item>pen_lft</item>
+      <item>pen_rt</item>
+      <item>pen_top</item>
+
+      <item>penlabels</item>
+      <item>penpos</item>
+      <item>penrazor</item>
+      <item>penspeck</item>
+      <item>pensquare</item>
+      <item>penstroke</item>
+
+      <item>pickup</item>
+      <item>pixels_per_inch</item>
+      <item>proof</item>
+      <item>proofoffset</item>
+      <item>proofrule</item>
+      <item>proofrulethickness</item>
+
+      <item>quartercircle</item>
+      <item>range</item>
+      <item>reflectedabout</item>
+      <item>relax</item>
+      <item>right</item>
+      <item>rotatedabout</item>
+
+      <item>rotatedaround</item>
+      <item>round</item>
+      <item>rt</item>
+      <item>rulepen</item>
+      <item>savepen</item>
+      <item>screenchars</item>
+
+      <item>screen_rows</item>
+      <item>screen_cols</item>
+      <item>screenrule</item>
+      <item>screenstrokes</item>
+      <item>shipit</item>
+      <item>showit</item>
+
+      <item>slantfont</item>
+      <item>smode</item>
+      <item>smoke</item>
+      <item>softjoin</item>
+      <item>solve</item>
+      <item>stop</item>
+
+      <item>superellipse</item>
+      <item>takepower</item>
+      <item>tensepath</item>
+      <item>titlefont</item>
+      <item>tolerance</item>
+      <item>top</item>
+
+      <item>tracingall</item>
+      <item>tracingnone</item>
+      <item>undraw</item>
+      <item>undrawdot</item>
+      <item>unfill</item>
+      <item>unfilldraw</item>
+
+      <item>unitpixel</item>
+      <item>unitsquare</item>
+      <item>unitvector</item>
+      <item>up</item>
+      <item>upto</item>
+      <item>vround</item>
+
+      <item>w</item>
+      <item>whatever</item>
+<!--       <item>beginlogochar</item> -->
+    </list>
+
+    <!--Here are some listing from mp.vim-->
+    <!--MetaPost primitives not found in Metafont-->
+    <list name="mpInternal">
+      <item>bluepart</item>
+
+      <item>clip</item>
+      <item>color</item>
+      <item>dashed</item>
+      <item>fontsize</item>
+      <item>greenpart</item>
+      <item>infont</item>
+
+      <item>linecap</item>
+      <item>linejoin</item>
+      <item>llcorner</item>
+      <item>lrcorner</item>
+      <item>miterlimit</item>
+      <item>mpxbreak</item>
+
+      <item>prologues</item>
+      <item>redpart</item>
+      <item>setbounds</item>
+      <item>tracinglostchars</item>
+      <item>truecorners</item>
+      <item>ulcorner</item>
+
+      <item>urcorner</item>
+      <item>withcolor</item>
+    </list>
+
+    <!--Metafont primitives not found in MetaPost-->
+    <list name="notDefined">
+      <item>autorounding</item>
+      <item>chardx</item>
+
+      <item>chardy</item>
+      <item>fillin</item>
+      <item>granularity</item>
+      <item>hppp</item>
+      <item>proofing</item>
+      <item>smoothing</item>
+
+      <item>tracingedges</item>
+      <item>tracingpens</item>
+      <item>turningcheck</item>
+      <item>vppp</item>
+      <item>xoffset</item>
+      <item>yoffset</item>
+
+    </list>
+
+    <!--Keywords defined by plain.mp-->
+    <list name="mpMacro">
+      <item>ahangle</item>
+      <item>ahlength</item>
+      <item>background</item>
+      <item>bbox</item>
+
+      <item>bboxmargin</item>
+<!--       <item>beginfig</item> -->
+      <item>beveled</item>
+      <item>black</item>
+      <item>blue</item>
+      <item>buildcycle</item>
+      <item>butt</item>
+
+      <item>center</item>
+      <item>cutafter</item>
+      <item>cutbefore</item>
+      <item>cuttings</item>
+      <item>dashpattern</item>
+      <item>defaultfont</item>
+
+      <item>defaultpen</item>
+      <item>defaultscale</item>
+      <item>dotlabel</item>
+      <item>dotlabels</item>
+      <item>drawarrow</item>
+      <item>drawdblarrow</item>
+
+      <item>drawoptions</item>
+<!--       <item>endfig</item> -->
+      <item>evenly</item>
+<!--       <item>extra_beginfig</item> -->
+<!--       <item>extra_endfig</item> -->
+      <item>green</item>
+      <item>label</item>
+      <item>labeloffset</item>
+
+      <item>mitered</item>
+      <item>red</item>
+      <item>rounded</item>
+      <item>squared</item>
+      <item>thelabel</item>
+      <item>white</item>
+
+      <item>base_name</item>
+      <item>base_version</item>
+      <item>upto</item>
+      <item>downto</item>
+      <item>exitunless</item>
+      <item>relax</item>
+
+      <item>gobble</item>
+      <item>gobbled</item>
+      <item>interact</item>
+      <item>loggingall</item>
+      <item>tracingall</item>
+      <item>tracingnone</item>
+
+      <item>eps</item>
+      <item>epsilon</item>
+      <item>infinity</item>
+      <item>right</item>
+      <item>left</item>
+      <item>up</item>
+
+      <item>down</item>
+      <item>origin</item>
+      <item>quartercircle</item>
+      <item>halfcircle</item>
+      <item>fullcircle</item>
+      <item>unitsquare</item>
+
+      <item>identity</item>
+      <item>blankpicture</item>
+      <item>withdots</item>
+      <item>ditto</item>
+      <item>EOF</item>
+      <item>pensquare</item>
+
+      <item>penrazor</item>
+      <item>penspeck</item>
+      <item>whatever</item>
+<!--       <item>abs</item> -->
+      <item>round</item>
+<!--       <item>ceiling</item> -->
+      <item>byte</item>
+
+      <item>dir</item>
+      <item>unitvector</item>
+      <item>inverse</item>
+      <item>counterclockwise</item>
+      <item>tensepath</item>
+<!--       <item>mod</item> -->
+<!--       <item>div</item> -->
+
+<!--       <item>dotprod</item> -->
+      <item>takepower</item>
+      <item>direction</item>
+      <item>directionpoint</item>
+      <item>intersectionpoint</item>
+      <item>softjoin</item>
+      <item>incr</item>
+
+      <item>decr</item>
+      <item>reflectedabout</item>
+      <item>rotatedaround</item>
+      <item>rotatedabout</item>
+<!--       <item>min</item> -->
+<!--       <item>max</item> -->
+      <item>flex</item>
+
+      <item>superellipse</item>
+      <item>interpath</item>
+      <item>magstep</item>
+      <item>currentpen</item>
+      <item>currentpen_path</item>
+      <item>currentpicture</item>
+
+      <item>fill</item>
+      <item>draw</item>
+      <item>filldraw</item>
+      <item>drawdot</item>
+      <item>unfill</item>
+      <item>undraw</item>
+
+      <item>unfilldraw</item>
+      <item>undrawdot</item>
+      <item>erase</item>
+      <item>cutdraw</item>
+      <item>image</item>
+      <item>pickup</item>
+
+      <item>numeric_pickup</item>
+      <item>pen_lft</item>
+      <item>pen_rt</item>
+      <item>pen_top</item>
+      <item>pen_bot</item>
+      <item>savepen</item>
+
+      <item>clearpen</item>
+      <item>clear_pen_memory</item>
+      <item>lft</item>
+      <item>rt</item>
+      <item>top</item>
+      <item>bot</item>
+
+      <item>ulft</item>
+      <item>urt</item>
+      <item>llft</item>
+      <item>lrt</item>
+      <item>penpos</item>
+      <item>penstroke</item>
+
+      <item>arrowhead</item>
+      <item>makelabel</item>
+      <item>labels</item>
+      <item>penlabel</item>
+      <item>range</item>
+      <item>numtok</item>
+
+      <item>thru</item>
+      <item>clearxy</item>
+      <item>clearit</item>
+      <item>clearpen</item>
+      <item>pickup</item>
+      <item>shipit</item>
+
+      <item>bye</item>
+      <item>hide</item>
+      <item>stop</item>
+      <item>solve</item>
+<!--       <item>beginchar</item> -->
+      <item>blacker</item>
+      <item>capsule_def</item>
+
+      <item>change_width</item>
+      <item>define_blacker_pixels</item>
+      <item>define_corrected_pixels</item>
+      <item>define_good_x_pixels</item>
+      <item>define_good_y_pixels</item>
+      <item>define_horizontal_corrected_pixels</item>
+
+      <item>define_pixels</item>
+      <item>define_whole_blacker_pixels</item>
+      <item>define_whole_vertical_blacker_pixels</item>
+      <item>define_whole_vertical_pixels</item>
+<!--       <item>endchar</item> -->
+<!--       <item>extra_beginchar</item> -->
+<!--       <item>extra_endchar</item> -->
+      <item>extra_setup</item>
+
+      <item>font_coding_scheme</item>
+      <item>font_extra_space</item>
+      <item>font_identifier</item>
+      <item>font_normal_shrink</item>
+      <item>font_normal_space</item>
+      <item>font_normal_stretch</item>
+
+      <item>font_quad</item>
+      <item>font_size</item>
+      <item>font_slant</item>
+      <item>font_x_height</item>
+      <item>italcorr</item>
+      <item>labelfont</item>
+
+      <item>makebox</item>
+      <item>makegrid</item>
+      <item>maketicks</item>
+      <item>mode_def</item>
+      <item>mode_setup</item>
+      <item>o_correction</item>
+
+      <item>proofrule</item>
+      <item>proofrulethickness</item>
+      <item>rulepen</item>
+      <item>smode</item>
+      <item>cullit</item>
+      <item>currenttransform</item>
+
+      <item>gfcorners</item>
+      <item>grayfont</item>
+      <item>hround</item>
+      <item>imagerules</item>
+      <item>lowres_fix</item>
+      <item>nodisplays</item>
+
+      <item>notransforms</item>
+      <item>openit</item>
+      <item>proofoffset</item>
+      <item>screenchars</item>
+      <item>screenrule</item>
+      <item>screenstrokes</item>
+
+      <item>showit</item>
+      <item>slantfont</item>
+      <item>titlefont</item>
+      <item>unitpixel</item>
+      <item>vround</item>
+      <item>circmargin</item>
+
+      <item>defaultdx</item>
+      <item>defaultdy</item>
+      <item>boxit</item>
+      <item>boxjoin</item>
+      <item>bpath</item>
+      <item>circleit</item>
+
+      <item>drawboxed</item>
+      <item>drawboxes</item>
+      <item>drawunboxed</item>
+      <item>fixpos</item>
+      <item>fixsize</item>
+      <item>pic</item>
+
+    </list>
+
+    <!--We put all the delimiters here. They will be treated apart, for code folding-->
+    <list name="EnvDelimiters">
+      <item>beginchar</item>
+      <item>endchar</item>
+      <item>extra_beginchar</item>
+      <item>extra_endchar</item>
+
+      <item>beginlogochar</item>
+      <item>beginfig</item>
+      <item>endfig</item>
+      <item>extra_beginfig</item>
+      <item>extra_endfig</item>
+    </list>
+
+    <contexts>
+      <context name="Normal Text"    attribute="Normal Text" lineEndContext="#stay">
+        <keyword String="mfBoolExp"  attribute="BoolExp" context="#stay"/>
+        <keyword String="mfNumExp"   attribute="NumExp" context="#stay"/>
+        <keyword String="mfInternal" attribute="Statement" context="#stay"/>
+        <keyword String="mfPairExp"  attribute="Statement" context="#stay"/>
+        <keyword String="mfPathExp"  attribute="Statement" context="#stay"/>
+        <keyword String="mfPenExp"   attribute="Statement" context="#stay"/>
+
+        <keyword String="mfPicExp"   attribute="Statement" context="#stay"/>
+        <keyword String="mfStringExp" attribute="Statement" context="#stay"/>
+        <keyword String="mfCommand"  attribute="Statement" context="#stay"/>
+        <keyword String="mfType"     attribute="Type" context="#stay"/>
+        <keyword String="mfStatement" attribute="Statement" context="#stay"/>
+        <keyword String="mfDefinition" attribute="Statement" context="#stay"/>
+        <keyword String="mfCondition" attribute="Conditional" context="#stay"/>
+        <keyword String="mfPrimitive" attribute="Statement" context="#stay"/>
+        <keyword String="mfMacro"    attribute="Macro" context="#stay"/>
+
+        <keyword String="mpInternal" attribute="Statement" context="#stay"/>
+        <keyword String="mpMacro"    attribute="Macro" context="#stay"/>
+
+        <DetectChar char="%" attribute="Comment" context="Comment"/>
+        <DetectChar char='"' attribute="String" context="string" beginRegion="String"/>
+        <RegExpr String="(\+|\-|\*|\/|\=|\:\=)" attribute="Operator" context="#stay"/>
+        <Detect2Chars char="." char1="." attribute="Operator" context="#stay"/>
+
+        <HlCOct attribute="Octal"/>
+        <HlCHex attribute="Hex"/>
+
+        <Float attribute="Float"/>
+        <Int attribute="Decimal"/>
+
+        <!--Metafont lengths-->
+        <RegExpr String="\b(bp|cc|cm|dd|in|mm|pc|pt)\b" attribute="Float" context="#stay"/>
+        <RegExpr String="\b-?\d+(bp|cc|cm|dd|in|mm|pc|pt)#?\b" attribute="Float" context="#stay"/>
+        <RegExpr String="\b-?\.\d+(bp|cc|cm|dd|in|mm|pc|pt)#?\b" attribute="Float" context="#stay"/>
+        <RegExpr String="\b-?\d+\.\d+(bp|cc|cm|dd|in|mm|pc|pt)#?\b" attribute="Float" context="#stay"/>
+
+        <!--Metafont coordinates, points, pathes-->
+
+        <RegExpr String="\b[xy]\d(\w|\')*" attribute="Variable" context="#stay"/>
+        <RegExpr String="\bz\d(\w|\')*" attribute="Variable" context="#stay"/>
+        <RegExpr String="\bp\d(\w|\')*" attribute="Variable" context="#stay"/>
+
+        <!--Special characters-->
+        <DetectChar char="$" attribute="Special" context="#stay"/>
+
+        <!--MetaPost has TeX inserts for typeset labels verbatimtex, btex, and etex will be treated as keywords-->
+        <RegExpr String="\b(verbatimtex|btex)\b" insensitive="1" attribute="Identifier" context="TeXMode" beginRegion="TeXblock"/>
+
+        <!--Here are some delimiters with code folding-->
+        <RegExpr String="\bbegin(group|fig|char)\b" insensitive="1" attribute="Identifier" context="#stay" beginRegion="block"/>
+        <RegExpr String="\bend(group|fig|char)\b" insensitive="1" attribute="Identifier" context="#stay" endRegion="block"/>
+
+        <RegExpr String="\bextra_begin(group|fig|char)\b" insensitive="1" attribute="Identifier" context="#stay" beginRegion="block"/>
+        <RegExpr String="\bextra_end(group|fig|char)\b" insensitive="1" attribute="Identifier" context="#stay" endRegion="block"/>
+
+        <RegExpr String="\b(def|vardef)\b" insensitive="1" attribute="Identifier" context="#stay" beginRegion="defblock"/>
+        <RegExpr String="\benddef\b" insensitive="1" attribute="Identifier" context="#stay" endRegion="defblock"/>
+
+        <RegExpr String="\bif\b" insensitive="1" attribute="Conditional" context="#stay" beginRegion="ifblock"/>
+        <RegExpr String="\bfi\b" insensitive="1" attribute="Conditional" context="#stay" endRegion="ifblock"/>
+        <RegExpr String="\b(for|forsuffixes|forever)\b" insensitive="1" attribute="Conditional" context="#stay" beginRegion="forblock"/>
+        <RegExpr String="\bendfor\b" insensitive="1" attribute="Conditional" context="#stay" endRegion="forblock"/>
+
+      </context>
+
+      <context name="string" attribute="String" lineEndContext="#stay">
+        <DetectIdentifier/>
+        <Detect2Chars char="\" char1='"' attribute="String" context="#stay"/>
+
+        <Detect2Chars char="\" char1="\" attribute="String" context="#stay"/>
+        <DetectChar char='"' attribute="String" context="#pop" endRegion="String"/>
+      </context>
+
+      <!--TeX mode : we just define generic TeX commands-->
+      <!--syntax from highlighting file latex.xml-->
+      <context name="TeXMode" attribute="Tex" lineEndContext="#stay">
+        <DetectChar char="\" attribute="Keyword" context="ContrSeq"/>
+        <DetectChar char="$" attribute="Math" context="MathMode" beginRegion="mathMode" />
+
+        <StringDetect String="\(" attribute="Math" context="MathMode" beginRegion="mathMode" />
+        <RegExpr String="\betex\b" insensitive="1" attribute="Identifier" context="#pop" endRegion="TeXblock"/>
+      </context>
+      <context name="ContrSeq" attribute="Keyword" lineEndContext="#pop">
+        <StringDetect String="verb*" attribute="Keyword" context="Verb"/>
+        <RegExpr String="verb(?=[^a-zA-Z])" attribute="Keyword" context="Verb"/>
+        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
+        <RegExpr String="[a-zA-Z]+(\+?|\*{0,3})" attribute="Keyword" context="#pop"/>
+        <RegExpr String="[^a-zA-Z]" attribute="Keyword" context="#pop" />
+
+      </context>
+      <context name="ToEndOfLine" attribute="Normal Text" lineEndContext="#pop">
+      </context>
+      <context name="Verb" attribute="Verbatim" lineEndContext="#pop#pop" >
+        <RegExpr String="(.)" attribute="Normal Text" dynamic="true" context="VerbEnd" />
+      </context>
+      <context name="VerbEnd" attribute="Verbatim" lineEndContext="#pop#pop#pop" dynamic="true" >
+        <StringDetect String="%1" attribute="Normal Text" context="#pop#pop#pop" dynamic="true" />
+        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
+
+        <RegExpr String="[^%1\xd7]*" attribute="Verbatim" context="#stay" dynamic="true" />
+      </context>
+
+      <!-- math mode: starting with $ or \( -->
+      <context name="MathMode" attribute="Math" lineEndContext="#stay">
+        <StringDetect String="$$" attribute="Error" context="#stay" />
+        <DetectChar char="\" attribute="Keyword Mathmode" context="MathContrSeq"/>
+        <DetectChar char="$" attribute="Math" context="#pop" endRegion="mathMode" />
+        <Detect2Chars char="\" char1=")" attribute="Math" context="#pop" endRegion="mathMode" />
+
+        <Detect2Chars char="\" char1="]" attribute="Error" context="#stay" />
+      </context>
+      <context name="MathContrSeq" attribute="Keyword Mathmode" lineEndContext="#pop">
+        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
+        <RegExpr String="[a-zA-Z]+\*?" attribute="Keyword Mathmode" context="#pop"/>
+        <RegExpr String="[^a-zA-Z]" attribute="Keyword Mathmode" context="#pop" /> 
+      </context>
+
+      <!-- comment -->
+      <context name="Comment" attribute="Comment" lineEndContext="#pop">
+
+        <RegExpr String="(FIXME|TODO):?" attribute="Alert" context="#stay"/>
+        <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
+      </context>
+
+</contexts>
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal"/>
+      <itemData name="Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="0" italic="0"/>
+      <itemData name="Keyword Mathmode" defStyleNum="dsNormal" color="#606000" selColor="#FFD0FF" bold="0" italic="0"/>
+      <itemData name="Comment" defStyleNum="dsComment"/>
+
+      <itemData name="Error" defStyleNum="dsAlert"/>
+      <itemData name="Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF"  bold="0" italic="0"/>
+      <itemData name="TeX" defStyleNum="dsNormal"/>
+      <itemData name="String" defStyleNum="dsString"/>
+      <itemData name="Alert" defStyleNum="dsAlert"/>
+      <itemData name="Macro"  defStyleNum="dsKeyword" color="#770000" selColor="#99FFFF" bold="0" italic="0"/>
+      <itemData name="Operator" defStyleNum="dsKeyword" color="#244CFF" bold="0"/>
+      <itemData name="Special" defStyleNum="dsKeyword" color="#008000" bold="0"/>
+      <itemData name="Conditional" defStyleNum="dsKeyword"/>
+
+      <itemData name="Statement" defStyleNum="dsNormal" color="#0000FF" selColor="#FFFF00" bold="0" italic="0"/>
+      <itemData name="BoolExp" defStyleNum="dsKeyword" italic="1" bold="0" color="#AA00AA" selColor="#FFFF00"/>
+      <itemData name="NumExp" defStyleNum="dsFunction"/>
+      <itemData name="Variable" defStyleNum="dsKeyword" color="#550022"/>
+      <itemData name="Identifier" defStyleNum="dsKeyword"/>
+      <itemData name="Type" defStyleNum="dsDataType"/>
+      <itemData name="Decimal" defStyleNum="dsDecVal"/>
+      <itemData name="Octal" defStyleNum="dsBaseN"/>
+      <itemData name="Hex" defStyleNum="dsBaseN"/>
+
+      <itemData name="Float" defStyleNum="dsFloat"/>
+ </itemDatas>
+  </highlighting>
+
+  <general>
+    <comments>
+      <comment name="singleLine" start="%"/>
+    </comments>
+    <keywords casesensitive="0" />
+
+  </general>
+</language>
+
diff --git a/kate/data/modelica.xml b/kate/data/modelica.xml
index 3cf570377..8a0c4cfdf 100644
--- a/kate/data/modelica.xml
+++ b/kate/data/modelica.xml
@@ -16,7 +16,7 @@
 -->
 
 
-<language name="Modelica" version="3.2-1" kateversion="2.0" casesensitive="1" section="Sources" extensions="*.mo" author="Federico Zenith" >
+<language name="Modelica" version="3.2-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 c48fc09cd..234cf8545 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.1" section="Sources" extensions="*.mod;*.def;*.mi;*.md" mimetype="text/x-modula-2">
+<language name="Modula-2" version="1.03" 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/nagios.xml b/kate/data/nagios.xml
new file mode 100644
index 000000000..d4f3634a8
--- /dev/null
+++ b/kate/data/nagios.xml
@@ -0,0 +1,84 @@
+<?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">
+    <highlighting>
+        <list name="Objects">
+            <item>host</item>
+            <item>hostgroup</item>
+            <item>service</item>
+            <item>servicegroup</item>
+            <item>contact</item>
+            <item>contactgroup</item>
+            <item>timeperiod</item>
+            <item>command</item>
+            <item>servicedependency</item>
+            <item>serviceescalation</item>
+            <item>hostdependency</item>
+            <item>hostescalation</item>
+            <item>hostextinfo</item>
+            <item>serviceextinfo</item>
+        </list>
+        <contexts>
+            <context name="Nagios" attribute="Normal Text" lineEndContext="#stay">
+                <DetectSpaces/>
+                <DetectChar char="#" attribute="Comment" context="Comment" firstNonSpace="true"/> <!-- or column="0"? -->
+                <DetectChar char="$" context="Macro Definition" firstNonSpace="true" lookAhead="true"/>
+                <keyword String="Keywords" attribute="Definition" context="Definition" firstNonSpace="true"/>
+                <StringDetect String="define" attribute="Definition" context="Definition" firstNonSpace="true"/>
+                <IncludeRules context="Variable" includeAttrib="true"/>
+            </context>
+            <context name="Comment" attribute="Comment" lineEndContext="#pop">
+                <IncludeRules context="##Alerts" />
+            </context>
+            <context name="Macro Definition" attribute="Macro Definition" lineEndContext="#pop">
+                <RangeDetect char="$" char1="$" firstNonSpace="true" context="#stay"/>
+                <DetectChar char="=" attribute="Symbol" context="Value"/>
+            </context>
+            <context name="Variable" attribute="Variable" lineEndContext="#pop">
+                <RegExpr String="[A-Za-z0-9_]+\s*" firstNonSpace="true" context="#stay"/>
+                <DetectChar char="=" attribute="Symbol" context="Value"/>
+            </context>
+            <context name="Definition" attribute="Definition" lineEndContext="#stay">
+                <DetectSpaces/>
+                <keyword String="Objects" attribute="Object" context="#stay"/>
+                <DetectChar char="{" attribute="Definition Block" context="Object Directives" beginRegion="Object Definition"/>
+                <RegExpr String="[^{]+" attribute="Invalid Text" context="#stay"/>
+            </context>
+            <context name="Object Directives" attribute="Object Directive" lineEndContext="#stay">
+                <DetectSpaces/>
+                <DetectChar char=";" attribute="Comment" context="Comment" firstNonSpace="true"/>
+                <RegExpr String="[A-Za-z0-9_]+\s*" firstNonSpace="true" attribute="Object Directive" context="Value"/>
+                <DetectChar char="}" attribute="Definition Block" context="Nagios" endRegion="Object Definition"/>
+            </context>
+            <context name="Value" attribute="Value" lineEndContext="#pop">
+                <RangeDetect char="$" char1="$" attribute="Macro" context="#stay"/>
+                <Float attribute="Float" />
+                <Int attribute="Int" />
+                <DetectChar char=";" attribute="Comment" context="Comment" />
+            </context>
+        </contexts>
+        <itemDatas>
+            <itemData name="Comment" defStyleNum="dsComment"/>
+            <itemData name="Normal Text" defStyleNum="dsNormal"/>
+            <itemData name="Variable" defStyleNum="dsNormal"/>
+            <itemData name="Object" defStyleNum="dsDataType"/>
+            <itemData name="Object Directive" defStyleNum="dsNormal"/>
+            <itemData name="Macro" defStyleNum="dsFunction"/>
+            <itemData name="Macro Definition" defStyleNum="dsFunction"/>
+            <itemData name="Value" defStyleNum="dsString"/>
+            <itemData name="Int" defStyleNum="dsDecVal"/>
+            <itemData name="Float" defStyleNum="dsFloat"/>
+            <itemData name="Symbol" defStyleNum="dsOthers"/>
+            <itemData name="Definition" defStyleNum="dsKeyword"/>
+            <itemData name="Definition Block" defStyleNum="dsRegionMarker"/>
+            <itemData name="Invalid Text" defStyleNum="dsError"/>
+        </itemDatas>
+    </highlighting>
+    <general>
+        <folding indentationsensitive="false"/>
+        <comments>
+            <comment name="singleLine" start="#"/>
+        </comments>
+        <keywords casesensitive="true"/>
+    </general>
+</language>
diff --git a/kate/data/nasm.xml b/kate/data/nasm.xml
index 6cbc555c8..315f2d548 100644
--- a/kate/data/nasm.xml
+++ b/kate/data/nasm.xml
@@ -850,9 +850,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <!-- The NASM's CPU directive -->
         <RegExpr attribute="NASM Keywords" context="#stay" String="cpu (pentium|ppro|p2|p3|katmai|p4|willamette|prescott|ia64)*"/>
         <!-- hexadecimal numbers -->
-        <RegExpr attribute="BaseN" context="#stay" insensitive="TRUE" String="(^|[ \t,]+)((\$|0x){1}[0-9]+[a-f0-9]*|[0-9]+[a-f0-9]*h)([ \t,]+|$)"/>
+        <RegExpr attribute="BaseN" context="#stay" insensitive="true" String="(^|[ \t,]+)((\$|0x){1}[0-9]+[a-f0-9]*|[0-9]+[a-f0-9]*h)([ \t,]+|$)"/>
         <!-- octal and binary numbers -->
-        <RegExpr attribute="BaseN" context="#stay" insensitive="TRUE" String="(^|[ \t,]+)([0-7]+(q|o)|[01]+b)([ \t,]+|$)"/>
+        <RegExpr attribute="BaseN" context="#stay" insensitive="true" String="(^|[ \t,]+)([0-7]+(q|o)|[01]+b)([ \t,]+|$)"/>
         <DetectChar attribute="Number" context="#stay" char="$"/>
         <HlCOct attribute="BaseN" context="#stay"/>
         <HlCHex attribute="BaseN" context="#stay"/>
diff --git a/kate/data/nemerle.xml b/kate/data/nemerle.xml
index edf5c7348..4eb1a7ba5 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.4" section="Sources" extensions="*.n" mimetype="text/x-nemerle" casesensitive="1" author="caminoix + Kamil Skalski (Nazgul)" license="">
+<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="">
 	<highlighting>
 		<list name="Attributes">
 			<item>abstract</item>
diff --git a/kate/data/nesc.xml b/kate/data/nesc.xml
index 20155b8dd..e90d4e219 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.1" section="Sources" extensions="*.nc" mimetype="text/x-ncsrc" priority="5">
+<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">
   <highlighting>
     <list name="keywords">
       <item> break </item>
@@ -93,20 +93,20 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay">
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
 	<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
-        <StringDetect attribute="Preprocessor" context="Outscoped" String="#if 0" insensitive="FALSE"/>
+        <StringDetect attribute="Preprocessor" context="Outscoped" String="#if 0" insensitive="false"/>
         <DetectChar attribute="Preprocessor" context="Preprocessor" char="#"/>
         <RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*[(])"/>
         <RegExpr attribute="Symbol" context="Member" String="[.]{1,1}"/>
diff --git a/kate/data/objectivec.xml b/kate/data/objectivec.xml
index f46641cb8..a49ed574f 100644
--- a/kate/data/objectivec.xml
+++ b/kate/data/objectivec.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Objective-C" version="1.07-1" kateversion="2.3" section="Sources" extensions="*.m;*.h" mimetype="text/x-objc-src;text/x-c-hdr">
+<language name="Objective-C" version="1.07-1" kateversion="2.2" section="Sources" extensions="*.m;*.h" mimetype="text/x-objc-src;text/x-c-hdr">
   <highlighting>
     <list name="keywords">
       <item> break </item>
@@ -178,14 +178,14 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml
index e46dc4057..8be78b2d4 100644
--- a/kate/data/objectivecpp.xml
+++ b/kate/data/objectivecpp.xml
@@ -245,14 +245,14 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
diff --git a/kate/data/oors.xml b/kate/data/oors.xml
index dccff286e..6a1819c74 100644
--- a/kate/data/oors.xml
+++ b/kate/data/oors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="OORS" version="1.1" kateversion="2.4" section="Sources" extensions="*.oors" author="Gernot Gebhard (gebhard@cs.uni-sb.de)" license="LGPL">
+<language name="OORS" version="1.2" kateversion="2.4" section="Sources" extensions="*.oors" author="Gernot Gebhard (gebhard@cs.uni-sb.de)" license="LGPL">
   <highlighting>
     <list name="oors">
       <item>allow</item>
@@ -54,11 +54,11 @@
         <DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="Unordered" />
         <IncludeRules context="##C++" />
       </context>
-      <context name="Accessor" attribute="Directive">
+      <context name="Accessor" attribute="Directive" lineEndContext="#stay">
         <Detect2Chars attribute="Directive" context="#stay" char="$" char1="$" />
         <RegExpr attribute="Directive" context="#stay" String="\$-?[_a-zA-Z1-9][_a-zA-Z0-9]*" />
       </context>
-      <context name="Comment" attribute="Comment">
+      <context name="Comment" attribute="Comment" lineEndContext="#stay">
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="CommentStar" char="/" char1="*" />
         <Detect2Chars attribute="Comment" context="CommentSlash" char="/" char1="/" />
@@ -83,12 +83,12 @@
       <itemData name="String Char" defStyleNum="dsChar"/>
       <itemData name="Data Type" defStyleNum="dsDataType"/>
     </itemDatas>
-    <general>
-      <comments>
-        <comment name="singleLine" start="//" />
-        <comment name="multiLine" start="/*" end="*/" region="Comment"/>
-      </comments>
-      <keywords casesensitive="1" />
-    </general>
   </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="//" />
+      <comment name="multiLine" start="/*" end="*/" region="Comment"/>
+    </comments>
+    <keywords casesensitive="1" />
+  </general>
 </language>
diff --git a/kate/data/opal.xml b/kate/data/opal.xml
index ac85f7c28..6bd92ae01 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.1" section="Sources" extensions="*.impl;*.sign" mimetype="" author="Sebastian Pipping (webmaster@hartwork.org)">
+<language name="OPAL" version="1.1" kateversion="2.3" section="Sources" extensions="*.impl;*.sign" mimetype="" author="Sebastian Pipping (webmaster@hartwork.org)">
 
 	<highlighting>
 
diff --git a/kate/data/opencl.xml b/kate/data/opencl.xml
index 46f1c514a..5c5cc7c5c 100644
--- a/kate/data/opencl.xml
+++ b/kate/data/opencl.xml
@@ -140,14 +140,14 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay" >
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="String" context="String" char="&quot;"/>
diff --git a/kate/data/perl.xml b/kate/data/perl.xml
index ebc78987b..b83bea9f3 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.29-2" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPL">
+<language name="Perl" version="1.30-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>
@@ -620,14 +620,14 @@
       </context>
 
       <!-- rules internal stuff wrt regex patterns -->
-      <context name="regex_pattern_internal_rules_1" lineEndContext="#stay">
+      <context name="regex_pattern_internal_rules_1" attribute="Pattern" lineEndContext="#stay">
         <RegExpr attribute="Comment" context="#stay" String="#.*$" firstNonSpace="true" />
         <RegExpr attribute="Pattern Character Class" context="#stay" String="\\[anDdSsWw]" />
         <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\\[ABbEGLlNUuQdQZz]" />
         <RegExpr attribute="Special Variable" context="#stay" String="\\[\d]+" />
         <RegExpr attribute="Pattern" context="#stay" String="\\." />
       </context>
-      <context name="regex_pattern_internal_rules_2" lineEndContext="#stay">
+      <context name="regex_pattern_internal_rules_2" attribute="Pattern" lineEndContext="#stay">
         <Detect2Chars attribute="Pattern Internal Operator" context="pat_ext" char="(" char1="?" />
         <DetectChar attribute="Pattern Internal Operator" context="pat_char_class" char="[" />
         <RegExpr attribute="Pattern Internal Operator" context="#stay" String="[()?^*+|]" />
diff --git a/kate/data/pgn.xml b/kate/data/pgn.xml
index 6d3bda5d1..4ac31de1e 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.4" 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="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">
 <highlighting>
   <list name="keywords_list">
     <item> Event </item>
diff --git a/kate/data/picsrc.xml b/kate/data/picsrc.xml
index 57386f559..a57b26cfa 100644
--- a/kate/data/picsrc.xml
+++ b/kate/data/picsrc.xml
@@ -294,11 +294,11 @@
         <keyword attribute="Preprocessor" context="#stay" String="conditional"/>
         <keyword attribute="GPASM-macros" context="#stay" String="gpasm_macro"/>
         <HlCHex attribute="Based Numbers" context="#stay"/>
-        <RegExpr attribute="Based Numbers" context="#stay" String="([ \t,][0-9A-F]+H[ \t,])" insensitive="TRUE" />
-        <RegExpr attribute="Based Numbers" context="#stay" String="([ \t,][0-9A-F]+H)$" insensitive="TRUE" />
-        <RegExpr attribute="Based Numbers" context="#stay" String="([ \t,][0-9]+D)" insensitive="TRUE" />
-        <RegExpr attribute="Based Numbers" context="#stay" String="([ \t,][0-7]+O)" insensitive="TRUE" />
-        <RegExpr attribute="Based Numbers" context="#stay" String="([ \t,][0-1]+B)" insensitive="TRUE" />
+        <RegExpr attribute="Based Numbers" context="#stay" String="([ \t,][0-9A-F]+H[ \t,])" insensitive="true" />
+        <RegExpr attribute="Based Numbers" context="#stay" String="([ \t,][0-9A-F]+H)$" insensitive="true" />
+        <RegExpr attribute="Based Numbers" context="#stay" String="([ \t,][0-9]+D)" insensitive="true" />
+        <RegExpr attribute="Based Numbers" context="#stay" String="([ \t,][0-7]+O)" insensitive="true" />
+        <RegExpr attribute="Based Numbers" context="#stay" String="([ \t,][0-1]+B)" insensitive="true" />
         <Int attribute="Non Based Numbers" context="#stay" />
         <HlCChar attribute="Char" context="#stay"/>
         <Detect2Chars attribute="Char" context="ASCIIChar" char="A" char1="'" />
diff --git a/kate/data/postscript.xml b/kate/data/postscript.xml
index b590db232..114f505d8 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.1" section="Markup" extensions="*.ps;*.ai;*.eps" mimetype="application/postscript">
+<language name="PostScript" version="1.01" kateversion="2.2" section="Markup" extensions="*.ps;*.ai;*.eps" mimetype="application/postscript">
 <highlighting>
 	<list name="keywords">
 		<item> abs </item>
diff --git a/kate/data/progress.xml b/kate/data/progress.xml
index 985a92091..73a5c4514 100644
--- a/kate/data/progress.xml
+++ b/kate/data/progress.xml
@@ -1597,66 +1597,66 @@
     <AnyChar attribute="Symbol" context="#stay" String="+-*=/\?~{}[]():."/>
 
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="PROCEDURE" insensitive="TRUE"
-                  beginRegion="P1" firstNonSpace="TRUE"/>
+                  String="PROCEDURE" insensitive="true"
+                  beginRegion="P1" firstNonSpace="true"/>
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="END PROCEDURE" insensitive="TRUE"
-                  endRegion="P1" firstNonSpace="TRUE"/>
+                  String="END PROCEDURE" insensitive="true"
+                  endRegion="P1" firstNonSpace="true"/>
 
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="FUNCTION" insensitive="TRUE"
-                  beginRegion="F1" firstNonSpace="TRUE"/>
+                  String="FUNCTION" insensitive="true"
+                  beginRegion="F1" firstNonSpace="true"/>
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="END FUNCTION" insensitive="TRUE"
-                  endRegion="F1" firstNonSpace="TRUE"/>
+                  String="END FUNCTION" insensitive="true"
+                  endRegion="F1" firstNonSpace="true"/>
 
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="CLASS" insensitive="TRUE"
-                  beginRegion="C1" firstNonSpace="TRUE"/>
+                  String="CLASS" insensitive="true"
+                  beginRegion="C1" firstNonSpace="true"/>
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="END CLASS" insensitive="TRUE"
-                  endRegion="C1" firstNonSpace="TRUE"/>
+                  String="END CLASS" insensitive="true"
+                  endRegion="C1" firstNonSpace="true"/>
 
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="METHOD" insensitive="TRUE"
-                  beginRegion="M1" firstNonSpace="TRUE"/>
+                  String="METHOD" insensitive="true"
+                  beginRegion="M1" firstNonSpace="true"/>
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="END METHOD" insensitive="TRUE"
-                  endRegion="M1" firstNonSpace="TRUE"/>
+                  String="END METHOD" insensitive="true"
+                  endRegion="M1" firstNonSpace="true"/>
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="CONSTRUCTOR" insensitive="TRUE"
-                  beginRegion="CN1" firstNonSpace="TRUE"/>
+                  String="CONSTRUCTOR" insensitive="true"
+                  beginRegion="CN1" firstNonSpace="true"/>
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="END CONSTRUCTOR" insensitive="TRUE"
-                  endRegion="CN1" firstNonSpace="TRUE"/>
+                  String="END CONSTRUCTOR" insensitive="true"
+                  endRegion="CN1" firstNonSpace="true"/>
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="DESTRUCTOR" insensitive="TRUE"
-                  beginRegion="DS1" firstNonSpace="TRUE"/>
+                  String="DESTRUCTOR" insensitive="true"
+                  beginRegion="DS1" firstNonSpace="true"/>
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="END DESTRUCTOR" insensitive="TRUE"
-                  endRegion="DS1" firstNonSpace="TRUE"/>
+                  String="END DESTRUCTOR" insensitive="true"
+                  endRegion="DS1" firstNonSpace="true"/>
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="INTERFACE" insensitive="TRUE"
-                  beginRegion="IF1" firstNonSpace="TRUE"/>
+                  String="INTERFACE" insensitive="true"
+                  beginRegion="IF1" firstNonSpace="true"/>
     <StringDetect attribute="Region Marker" context="#stay"
-                  String="END INTERFACE" insensitive="TRUE"
-                  endRegion="IF1" firstNonSpace="TRUE"/>
+                  String="END INTERFACE" insensitive="true"
+                  endRegion="IF1" firstNonSpace="true"/>
 
     <StringDetect attribute="Function" context="#stay"
-                  String="DO:" insensitive="TRUE"
-                  beginRegion="L1" firstNonSpace="FALSE"/>
+                  String="DO:" insensitive="true"
+                  beginRegion="L1" firstNonSpace="false"/>
     <StringDetect attribute="Function" context="#stay"
-                  String="REPEAT" insensitive="TRUE"
-                  beginRegion="L1" firstNonSpace="TRUE"/>
+                  String="REPEAT" insensitive="true"
+                  beginRegion="L1" firstNonSpace="true"/>
     <StringDetect attribute="Function" context="#stay"
-                  String="FOR" insensitive="TRUE"
-                  beginRegion="L1" firstNonSpace="TRUE"/>
+                  String="FOR" insensitive="true"
+                  beginRegion="L1" firstNonSpace="true"/>
     <StringDetect attribute="Function" context="#stay"
-                  String="CASE" insensitive="TRUE"
-                  beginRegion="L1" firstNonSpace="TRUE"/>
+                  String="CASE" insensitive="true"
+                  beginRegion="L1" firstNonSpace="true"/>
     <StringDetect attribute="Function" context="#stay"
-                  String="END" insensitive="TRUE"
-                  endRegion="L1" firstNonSpace="TRUE"/>
+                  String="END" insensitive="true"
+                  endRegion="L1" firstNonSpace="true"/>
 
 
   </context>
diff --git a/kate/data/prolog.xml b/kate/data/prolog.xml
index 905b59493..3d434bca2 100644
--- a/kate/data/prolog.xml
+++ b/kate/data/prolog.xml
@@ -105,7 +105,7 @@ to make the rules more expressive. -->
     <!ENTITY bs         "\">
 ]>
 <language name="Prolog" section="Sources"
-	  version="1.2-1" kateversion="2.3"
+	  version="1.3-1" kateversion="2.3"
 	  mimetype="text/x-prolog"
 	  extensions="*.prolog;*.dcg;*.pro"
 	  author="Torsten Eichstädt (torsten.eichstaedt@web.de)"
@@ -825,10 +825,10 @@ TODO sorted by priority
 
 	    <!-- id,var,graphic: ASSERT calling context ashured 1st char is ok
 				 ASSERT we get the 1st char for id & var -->
-	    <context name="id" attribute="Syntax Error" >
+	    <context name="id" attribute="Syntax Error" lineEndContext="#stay" >
 		<DetectIdentifier context="#pop" attribute="Normal Text" />
 	    </context>
-	    <context name="var" attribute="Syntax Error" >
+	    <context name="var" attribute="Syntax Error" lineEndContext="#stay" >
 		<DetectIdentifier context="#pop" attribute="_VARIABLE" />
 	    </context>
 	    <context name="graphic" lineEndContext="#pop" attribute="Syntax Error" fallthrough="true" fallthroughContext="#pop" >
diff --git a/kate/data/protobuf.xml b/kate/data/protobuf.xml
index 19e7d9784..3926ecec3 100644
--- a/kate/data/protobuf.xml
+++ b/kate/data/protobuf.xml
@@ -60,7 +60,7 @@
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay">
-            <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+            <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <RegExpr attribute="Char" context="#stay" String="'\\u[0-9a-fA-F]{4}'"/>
diff --git a/kate/data/python.xml b/kate/data/python.xml
index 9cbae2df1..e77aa8c03 100644
--- a/kate/data/python.xml
+++ b/kate/data/python.xml
@@ -13,7 +13,7 @@
 <!-- v2.06 decorator names can (and often do) contain periods -->
 <!-- v2.07 add support for %prog and co, see bug 142832 -->
 <!-- v2.08 add missing overloaders, new Python 3 statements, builtins, and keywords -->
-<language name="Python" version="2.22" style="python" kateversion="2.4" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python" casesensitive="1" author="Michael Bueker" license="">
+<language name="Python" version="2.23" style="python" kateversion="2.4" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python" casesensitive="1" author="Michael Bueker" license="">
 	<highlighting>
 		<list name="prep">
 			<item> import </item>
@@ -378,10 +378,10 @@
 				<StringDetect attribute="String" String="u&quot;&quot;&quot;" insensitive="true" context="Tripple Q-string" beginRegion="Tripple Q-region"/>
 				<!-- ' -->
 				<DetectChar attribute="String" char="'" context="Single A-string"/>
-				<Detect2Chars attribute="String" char="u" char1="'" insensitive="true" context="Single A-string"/>
+				<StringDetect attribute="String" String="u'" insensitive="true" context="Single A-string"/>
 				<!-- " -->
 				<DetectChar attribute="String" char="&quot;" context="Single Q-string"/>
-				<Detect2Chars attribute="String" char="u" char1="&quot;" insensitive="true" context="Single Q-string"/>
+				<StringDetect attribute="String" String="u&quot;" insensitive="true" context="Single Q-string"/>
 
 				<!-- ''' -->
 				<StringDetect attribute="Raw String" String="r'''" insensitive="true" context="Raw Tripple A-string" beginRegion="Tripple A-region"/>
@@ -407,10 +407,10 @@
 				<StringDetect attribute="Comment" String="u&quot;&quot;&quot;" insensitive="true" firstNonSpace="true" context="Tripple Q-comment" beginRegion="Tripple Q-region"/>
 				<!-- ' -->
 				<DetectChar attribute="Comment" char="'" firstNonSpace="true" context="Single A-comment"/>
-				<Detect2Chars attribute="Comment" char="u" char1="'" insensitive="true" firstNonSpace="true" context="Single A-comment"/>
+				<StringDetect attribute="Comment" String="u'" insensitive="true" firstNonSpace="true" context="Single A-comment"/>
 				<!-- " -->
 				<DetectChar attribute="Comment" char="&quot;" firstNonSpace="true" context="Single Q-comment"/>
-				<Detect2Chars attribute="Comment" char="u" char1="&quot;" insensitive="true" firstNonSpace="true" context="Single Q-comment"/>
+				<StringDetect attribute="Comment" String="u&quot;" insensitive="true" firstNonSpace="true" context="Single Q-comment"/>
 
 				<!-- ''' -->
 				<StringDetect attribute="Comment" String="r'''" insensitive="true" firstNonSpace="true" context="Tripple A-comment" beginRegion="Tripple A-region"/>
diff --git a/kate/data/q.xml b/kate/data/q.xml
new file mode 100644
index 000000000..a470e5ef7
--- /dev/null
+++ b/kate/data/q.xml
@@ -0,0 +1,210 @@
+<?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)">
+<highlighting>
+    <list name="DotQ">
+      <item>.Q.addmonths</item>
+      <item>.Q.addr</item>
+      <item>.Q.host</item>
+      <item>.Q.chk</item>
+      <item>.Q.cn</item>
+      <item>.Q.dd</item>
+      <item>.Q.dpft</item>
+      <item>.Q.dsftg</item>
+      <item>.Q.def</item>
+      <item>.Q.en</item>
+      <item>.Q.fc</item>
+      <item>.Q.fk</item>
+      <item>.Q.fmt</item>
+      <item>.Q.fs</item>
+      <item>.Q.ft</item>
+      <item>.Q.fu</item>
+      <item>.Q.gc</item>
+      <item>.Q.hdpf</item>
+      <item>.Q.ind</item>
+      <item>.Q.j10</item>
+      <item>.Q.x10</item>
+      <item>.Q.j12</item>
+      <item>.Q.x12</item>
+      <item>.Q.k</item>
+      <item>.Q.l</item>
+      <item>.Q.opt</item>
+      <item>.Q.par</item>
+      <item>.Q.qp</item>
+      <item>.Q.qt</item>
+      <item>.Q.s</item>
+      <item>.Q.ty</item>
+      <item>.Q.v</item>
+      <item>.Q.V</item>
+      <item>.Q.view</item>
+      <item>.Q.w</item>
+      <item>.Q.M</item>
+      <item>.Q.pf</item>
+      <item>.Q.pt</item>
+      <item>.Q.PD</item>
+      <item>.Q.PV</item>
+      <item>.Q.pd</item>
+      <item>.Q.pv</item>
+      <item>.Q.pn</item>
+      <item>.Q.bv</item>
+      <item>.Q.vp</item>
+      <item>.Q.P</item>
+      <item>.Q.D</item>
+      <item>.Q.u</item>
+    </list>
+    <list name="qkeywords">
+      <item>aj</item>
+      <item>aj0</item>
+      <item>all</item>
+      <item>and</item>
+      <item>any</item>
+      <item>asc</item>
+      <item>asof</item>
+      <item>attr</item>
+      <item>avgs</item>
+      <item>ceiling</item>
+      <item>cols</item>
+      <item>cor</item>
+      <item>count</item>
+      <item>cov</item>
+      <item>cross</item>
+      <item>csv</item>
+      <item>cut</item>
+      <item>deltas</item>
+      <item>desc</item>
+      <item>dev</item>
+      <item>differ</item>
+      <item>distinct</item>
+      <item>each</item>
+      <item>ej</item>
+      <item>enlist</item>
+      <item>eval</item>
+      <item>except</item>
+      <item>fby</item>
+      <item>fills</item>
+      <item>first</item>
+      <item>fkeys</item>
+      <item>flip</item>
+      <item>floor</item>
+      <item>from</item>
+      <item>get</item>
+      <item>group</item>
+      <item>gtime</item>
+      <item>hclose</item>
+      <item>hcount</item>
+      <item>hdel</item>
+      <item>hopen</item>
+      <item>hsym</item>
+      <item>iasc</item>
+      <item>idesc</item>
+      <item>ij</item>
+      <item>inter</item>
+      <item>inv</item>
+      <item>key</item>
+      <item>keys</item>
+      <item>lj</item>
+      <item>load</item>
+      <item>lower</item>
+      <item>lsq</item>
+      <item>ltime</item>
+      <item>ltrim</item>
+      <item>mavg</item>
+      <item>maxs</item>
+      <item>mcount</item>
+      <item>md5</item>
+      <item>mdev</item>
+      <item>med</item>
+      <item>meta</item>
+      <item>mins</item>
+      <item>mmax</item>
+      <item>mmin</item>
+      <item>mmu</item>
+      <item>mod</item>
+      <item>msum</item>
+      <item>neg</item>
+      <item>next</item>
+      <item>not</item>
+      <item>null</item>
+      <item>or</item>
+      <item>over</item>
+      <item>parse</item>
+      <item>peach</item>
+      <item>pj</item>
+      <item>plist</item>
+      <item>prds</item>
+      <item>prev</item>
+      <item>prior</item>
+      <item>rand</item>
+      <item>rank</item>
+      <item>ratios</item>
+      <item>raze</item>
+      <item>read0</item>
+      <item>read1</item>
+      <item>reciprocal</item>
+      <item>reverse</item>
+      <item>rload</item>
+      <item>rotate</item>
+      <item>rsave</item>
+      <item>rtrim</item>
+      <item>save</item>
+      <item>scan</item>
+      <item>set</item>
+      <item>show</item>
+      <item>signum</item>
+      <item>ssr</item>
+      <item>string</item>
+      <item>sublist</item>
+      <item>sums</item>
+      <item>sv</item>
+      <item>system</item>
+      <item>tables</item>
+      <item>til</item>
+      <item>trim</item>
+      <item>txf</item>
+      <item>type</item>
+      <item>uj</item>
+      <item>ungroup</item>
+      <item>union</item>
+      <item>update</item>
+      <item>upper</item>
+      <item>upsert</item>
+      <item>value</item>
+      <item>var</item>
+      <item>view</item>
+      <item>views</item>
+      <item>vs</item>
+      <item>where</item>
+      <item>wj</item>
+      <item>wj1</item>
+      <item>xasc</item>
+      <item>xbar</item>
+      <item>xcol</item>
+      <item>xcols</item>
+      <item>xdesc</item>
+      <item>xgroup</item>
+      <item>xkey</item>
+      <item>xlog</item>
+      <item>xprev</item>
+      <item>xrank</item>
+    </list>
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
+        <keyword attribute="qKeyword" context="#stay" String="qkeywords" />
+        <keyword attribute="DotQfunctions" context="#stay" String="DotQ" />
+        <IncludeRules context="##k" />
+      </context>
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text" defStyleNum="dsNormal" />
+      <itemData name="qKeyword" defStyleNum="dsKeyword" />
+      <itemData name="DotQfunctions" defStyleNum="dsKeyword" />
+    </itemDatas>
+  </highlighting>
+  <general>
+    <comments>
+      <comment name="singleLine" start="/" />
+      <comment name="multiLine" start="/" end="\" />
+    </comments>
+    <keywords casesensitive="1" weakDeliminator="." additionalDeliminator="`#'@$&quot;" />
+  </general>
+</language>
diff --git a/kate/data/r.xml b/kate/data/r.xml
index 1c5048b7f..8213d5b4a 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.07-1" kateversion="2.5" name="R Script" section="Scripts" extensions="*.R;*.r;*.S;*.s;*.q" mimetype="" license="GPL">
+<language version="2.07-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 cef5f493c..3f90adbbe 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.1" section="Sources" extensions="*.rqb" author="Tiberiu Dragulinescu" license="LGPL">
+<language name="RapidQ" version="1.01" 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 974f37ff5..f62dcaff3 100644
--- a/kate/data/relaxng.xml
+++ b/kate/data/relaxng.xml
@@ -17,7 +17,7 @@
 -->
 
 <language version="0.8"
-          kateversion="2.1"
+          kateversion="2.4"
           name="RELAX NG"
           section="Markup"
           extensions="*.rng;*.RNG"
diff --git a/kate/data/replicode.xml b/kate/data/replicode.xml
new file mode 100644
index 000000000..5c191215d
--- /dev/null
+++ b/kate/data/replicode.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+<!--
+This file is part of KDE's kate project.
+
+copyright   : (C) 2014 by Martin Sandsmark
+email       : martin.sandsmark@kde.org
+
+This file is free software; you can redistribute it and/or modify
+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">
+    <highlighting>
+        <list name="operators">
+            <item>_now</item>
+            <item>equ</item>
+            <item>neq</item>
+            <item>gtr</item>
+            <item>lsr</item>
+            <item>gte</item>
+            <item>lse</item>
+            <item>add</item>
+            <item>sub</item>
+            <item>mul</item>
+            <item>div</item>
+            <item>dis</item>
+            <item>ln</item>
+            <item>exp</item>
+            <item>log</item>
+            <item>e10</item>
+            <item>syn</item>
+            <item>red</item>
+            <item>rnd</item>
+            <item>fvw</item>
+        </list>
+        <list name="builtin_classes">
+            <item>view</item>
+            <item>grp_view</item>
+            <item>pgm_view</item>
+            <item>_obj</item>
+            <item>ptn</item>
+            <item>|ptn</item>
+            <item>pgm</item>
+            <item>|pgm</item>
+            <item>_grp</item>
+            <item>grp</item>
+            <item>_fact</item>
+            <item>fact</item>
+            <item>|fact</item>
+            <item>pred</item>
+            <item>goal</item>
+            <item>cst</item>
+            <item>mdl</item>
+            <item>icst</item>
+            <item>icmd</item>
+            <item>cmd</item>
+            <item>ent</item>
+            <item>ont</item>
+            <item>dev</item>
+            <item>nod</item>
+            <item>ipgm</item>
+            <item>icpp_pgm</item>
+            <item>perf</item>
+        </list>
+        <list name="marker_classes">
+            <item>mk.rdx</item>
+            <item>mk.grp_pair</item>
+            <item>mk.low_sln</item>
+            <item>mk.high_sln</item>
+            <item>mk.low_act</item>
+            <item>mk.high_act</item>
+            <item>mk.low_res</item>
+            <item>mk.sln_chg</item>
+            <item>mk.act_chg</item>
+            <item>mk.new</item>
+        </list>
+        <list name="entities">
+            <item>self</item>
+        </list>
+        <list name="groups">
+            <item>stdin</item>
+            <item>stdout</item>
+        </list>
+        <list name="functions">
+            <item>_inj</item>
+            <item>_eje</item>
+            <item>_mod</item>
+            <item>_set</item>
+            <item>_new_class</item>
+            <item>_del_class</item>
+            <item>_ldc</item>
+            <item>_swp</item>
+            <item>_stop</item>
+        </list>
+        <list name="constants">
+            <item>|nb</item>
+            <item>|bl</item>
+            <item>true</item>
+            <item>false</item>
+            <item>|[]</item>
+            <item>|nid</item>
+            <item>|did</item>
+            <item>|fid</item>
+            <item>|st</item>
+            <item>|us</item>
+            <item>forever</item>
+        </list>
+        <contexts>
+            <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
+                <RegExpr String="[a-zA-Z0-9_\.]+:\(" attribute="Class Definition" context="open_parens" beginRegion="true" />
+                <StringDetect attribute="Preprocessor" context="preprocessor_load" String="!load " />
+                <RegExpr String="\![a-zA-Z0-9_\.]+" attribute="Preprocessor" context="preprocessor" />
+                <RegExpr attribute="ListBracket" context="list" String="[^\|]\[" />
+                <IncludeRules context="global_data_type" />
+            </context>
+            <context attribute="Identifier" lineEndContext="error" name="open_parens">
+                <keyword attribute="Function" String="functions" context="class_definition"/>
+                <keyword attribute="Operator" String="operators" context="class_definition"/>
+                <keyword attribute="Builtin Class" String="builtin_classes" context="class_definition"/>
+                <keyword attribute="Builtin Class" String="marker_classes" context="class_definition"/>
+                <RegExpr String="[a-zA-Z0-9_\.&gt;&lt;]+" attribute="Class Name" context="class_definition" />
+            </context>
+            <context attribute="Class Definition" lineEndContext="#stay" name="global_data_type">
+                <DetectChar attribute="Comment" context="comment" char=";" />
+                <StringDetect attribute="EmptyList" context="#stay" String="|[]" />
+                <DetectChar attribute="ListBracket" context="list" char="[" />
+            </context>
+            <context attribute="Class Definition" lineEndContext="#stay" name="data_type">
+                <keyword attribute="Operator" String="operators" context="#stay" />
+                <keyword attribute="Constant" String="constants" context="#stay"/>
+                <keyword attribute="Group" String="groups" context="#stay"/>
+                <keyword attribute="Entity" String="entities" context="#stay"/>
+                <IncludeRules context="global_data_type" />
+                <HlCHex attribute="Hex" context="#stay" />
+                <RegExpr attribute="Number" context="#stay" String="[0-9]+us"/>
+                <Int attribute="Number" context="#stay" />
+                <DetectChar attribute="String" context="string" char="&quot;" />
+                <RegExpr String="[A-Z_]+" attribute="Constant" context="#stay" />
+                <RegExpr String="[a-z0-9_\.&lt;&gt;\.=+\-*\\/]+" attribute="Member" context="#stay" />
+                <DetectChar attribute="Class Definition" context="open_parens" char="(" beginRegion="true" />
+            </context>
+            <context attribute="Comment" lineEndContext="#pop" name="comment">
+                <IncludeRules context="##Alerts" />
+                <IncludeRules context="##Modelines" />
+            </context>
+            <context attribute="Class Definition" lineEndContext="#stay" name="class_definition">
+                <DetectChar attribute="Class Definition" context="#pop#pop" char=")" endRegion="true" />
+                <IncludeRules context="data_type" />
+            </context>
+            <context attribute="Member" lineEndContext="error" name="list">
+                <DetectChar attribute="ListBracket" context="#pop" char="]" />
+                <IncludeRules context="data_type" />
+            </context>
+            <context attribute="String" lineEndContext="error" name="string">
+                <DetectChar attribute="String" context="#pop" char="&quot;" />
+            </context>
+            <context attribute="Error" lineEndContext="#stay" name="error" />
+            <context attribute="Preprocessor" lineEndContext="#pop" name="preprocessor">
+                <IncludeRules context="data_type" />
+            </context>
+            <context attribute="Path" lineEndContext="#pop" name="preprocessor_load" />
+        </contexts>
+        <itemDatas>
+            <itemData name="Normal Text" defStyleNum="dsNormal"/>
+            <itemData name="String" defStyleNum="dsString"/>
+            <itemData name="Path" defStyleNum="dsString" bold="1" />
+            <itemData name="Class Definition" defStyleNum="dsOthers" />
+            <itemData name="Preprocessor" defStyleNum="dsNormal" bold="1" />
+            <itemData name="Class Name" defStyleNum="dsFunction" />
+            <itemData name="Builtin Class" defStyleNum="dsFunction" bold="1" />
+            <itemData name="Member" defStyleNum="dsKeyword" bold="0" />
+            <itemData name="Constant" defStyleNum="dsKeyword" bold="1" />
+            <itemData name="Group" defStyleNum="dsKeyword" italic="1" bold="0" />
+            <itemData name="Entity" defStyleNum="dsKeyword" italic="1" bold="1" />
+            <itemData name="Operator" defStyleNum="dsFunction" italic="1" bold="0" />
+            <itemData name="Function" defStyleNum="dsFunction" italic="0" bold="1" />
+            <itemData name="Bracket" defStyleNum="dsOthers" />
+            <itemData name="ListBracket" defStyleNum="dsOthers" color="#0095ff" selColor="#0095ff" bold="0" italic="0" />
+            <itemData name="EmptyList" defStyleNum="dsOthers" color="#0095ff" selColor="#0095ff" bold="1" italic="0" />
+            <itemData name="Identifier" defStyleNum="dsFunction" />
+            <itemData name="List" defStyleNum="dsRegionMarker" />
+            <itemData name="MultiList" defStyleNum="dsError" />
+            <itemData name="Number" defStyleNum="dsDecVal" />
+            <itemData name="Float" defStyleNum="dsFloat" />
+            <itemData name="Error" defStyleNum="dsError" />
+            <itemData name="Comment" defStyleNum="dsComment" />
+            <itemData name="Hex" defStyleNum="dsBaseN" />
+        </itemDatas>
+    </highlighting>
+    <general>
+        <comments>
+            <comment name="singleLine" start=";" />
+        </comments>
+        <folding indentationsensitive="1" />
+        <keywords casesensitive="1" weakDeliminator="|." />
+    </general>
+</language>
+<!-- kate: space-indent on; indent-width 4; replace-tabs on; indent-mode xml; -->
diff --git a/kate/data/rexx.xml b/kate/data/rexx.xml
index b22f65d0d..29bd668e7 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.3" section="Scripts" extensions="*.rex" mimetype="">
+<language name="REXX" version="1.01" 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 560fb6d77..c5863dda0 100644
--- a/kate/data/rhtml.xml
+++ b/kate/data/rhtml.xml
@@ -339,15 +339,15 @@
 				<StringDetect attribute="CDATA" context="CDATA" String="&lt;![CDATA[" beginRegion="cdata" />
 				<RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" beginRegion="doctype" />
 				<RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:-]*" beginRegion="pi" />
-				<RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="TRUE" beginRegion="style" />
-				<RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="TRUE" beginRegion="script" />
-				<RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="TRUE" beginRegion="pre" />
-				<RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="TRUE" beginRegion="div" />
-				<RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="TRUE" beginRegion="table" />
+				<RegExpr attribute="Element" context="CSS" String="&lt;style\b" insensitive="true" beginRegion="style" />
+				<RegExpr attribute="Element" context="JS" String="&lt;script\b" insensitive="true" beginRegion="script" />
+				<RegExpr attribute="Element" context="El Open" String="&lt;pre\b" insensitive="true" beginRegion="pre" />
+				<RegExpr attribute="Element" context="El Open" String="&lt;div\b" insensitive="true" beginRegion="div" />
+				<RegExpr attribute="Element" context="El Open" String="&lt;table\b" insensitive="true" beginRegion="table" />
 				<RegExpr attribute="Element" context="El Open" String="&lt;&name;" />
-				<RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="TRUE" endRegion="pre" />
-				<RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="TRUE" endRegion="div" />
-				<RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="TRUE" endRegion="table" />
+				<RegExpr attribute="Element" context="El Close" String="&lt;/pre\b" insensitive="true" endRegion="pre" />
+				<RegExpr attribute="Element" context="El Close" String="&lt;/div\b" insensitive="true" endRegion="div" />
+				<RegExpr attribute="Element" context="El Close" String="&lt;/table\b" insensitive="true" endRegion="table" />
 				<RegExpr attribute="Element" context="El Close" String="&lt;/&name;" />
 				<!-- as long as kde gives DTDs the text/html mimetype--><IncludeRules context="FindDTDRules" />
 				<IncludeRules context="FindEntityRefs" />
@@ -469,7 +469,7 @@
 			<context name="CSS content" attribute="Normal Text" lineEndContext="#stay">
 				<RegExpr attribute="Keyword" context="rubysource" String="&lt;%=?" />
 				
-				<RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="TRUE" endRegion="style" />
+				<RegExpr attribute="Element" context="El Close 2" String="&lt;/style\b" insensitive="true" endRegion="style" />
 				<IncludeRules context="##CSS" includeAttrib="true"/>
 			</context>
 			
@@ -485,13 +485,13 @@
 			<context name="JS content" attribute="Normal Text" lineEndContext="#stay">
 				<RegExpr attribute="Keyword" context="rubysource" String="&lt;%=?" />
 				
-				<RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
-				<RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="TRUE" />
+				<RegExpr attribute="Element" context="El Close 2" String="&lt;/script\b" insensitive="true" endRegion="script" />
+				<RegExpr attribute="Comment" context="JS comment close" String="//(?=.*&lt;/script\b)" insensitive="true" />
 				<IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
 			</context>
 			
 			<context name="JS comment close" attribute="Comment" lineEndContext="#pop">
-				<RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="TRUE" endRegion="script" />
+				<RegExpr attribute="Element" context="El Close 3" String="&lt;/script\b" insensitive="true" endRegion="script" />
 				<IncludeRules context="##Alerts" />
 			</context>
 			
diff --git a/kate/data/roff.xml b/kate/data/roff.xml
new file mode 100644
index 000000000..8806cf55c
--- /dev/null
+++ b/kate/data/roff.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+  <!ENTITY roffidc "[^]\s]">
+  <!ENTITY roffid  "(&roffidc;|\(&roffidc;{2}|\[&roffidc;+\])">
+  <!ENTITY roffnum "([0-9]+)">
+  <!ENTITY argsep1 "([^\\]|\\[&#37; |^{}'`-_!?@)/,&amp;:~0acdeEprtu])">
+  <!ENTITY argsep2 "([^\\0-9]|\\[&#37;:{}'`-_!@/cep])">
+]>
+<language name="Roff" section="Markup" version="0.11" kateversion="2.4" extensions="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
+
+  <highlighting>
+
+    <list name="layout">
+      <item>br</item>
+      <item>sp</item>
+    </list>
+
+    <list name="formatting">
+    </list>
+
+    <list name="gnuext">
+    </list>
+
+    <contexts>
+
+      <!-- root context -->
+      <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
+        <IncludeRules context="DetectComments"/>
+        <DetectChar attribute="Other Macros" context="DetectDirective" char="." column="0"/>
+        <IncludeRules context="DetectOthers"/>
+      </context>
+
+      <context name="DetectComments" attribute="Normal Text" lineEndContext="#stay">
+        <RegExpr attribute="Comment" context="Comment" String="\.\s*\\&quot;" column="0"/>
+        <Detect2Chars attribute="Comment" context="Comment" char="\\" char1="&quot;"/>
+        <Detect2Chars attribute="Comment" context="Comment" char="\\" char1="#"/>
+      </context>
+
+      <!-- catch glyphc, registers, strings, etc -->
+      <context name="DetectOthers" attribute="Normal Text" lineEndContext="#stay">
+        <IncludeRules context="DetectComments"/>
+        <DetectChar attribute="Escape" context="DetectEscape" char="\\" lookAhead="true"/>
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+      </context>
+
+      <!-- detect escapes -->
+      <context name="DetectEscape" attribute="Error" lineEndContext="#pop">
+        <RegExpr attribute="Register" context="#pop" String="\\(\*|n[+-]?)&roffid;"/>
+        <RegExpr attribute="Font" context="#pop" String="\\[fF]&roffid;"/>
+        <RegExpr attribute="Font" context="#pop" String="\\f([0-9]|\([0-9][0-9]|\[[0-9]+\])"/>
+        <RegExpr attribute="Font" context="#pop" String="\\s(\[([1-3][0-9]|[04-9])\]|[04-9]|[+-][0-9]|([+-]?\(|\([+-])[0-9][0-9])"/>
+        <Detect2Chars attribute="Escape" context="#pop" char="\\" char1="\\"/>
+        <RegExpr attribute="Escape" context="#pop" String="\\(\$[0-9*@]|[.:&#37; |^{}_!?@)/,&amp;:~0acdeEprtu])"/>
+        <RegExpr attribute="Escape" context="Argument" String="\\[AbBDowXZ]&argsep1;"/>
+        <RegExpr attribute="Escape" context="#pop" String="\\[gkmMVYz]&roffid;"/>
+        <RegExpr attribute="Escape" context="#pop" String="\\O([0-4]|\[5[lrci][^]]\])"/>
+        <RegExpr attribute="Escape" context="Measurement" String="\\[hHSvx]&argsep1;"/>
+        <RegExpr attribute="Escape" context="Measurement" String="\\[lL]&argsep1;\|?"/> <!-- TODO - optional trailing &glyph; -->
+        <RegExpr attribute="Escape" context="Argument" String="\\R&argsep1;"/> <!-- TODO - &roffid; (register), measurement -->
+        <RegExpr attribute="Glyph" context="GlyphArgument" String="\\C&argsep1;"/>
+        <RegExpr attribute="Glyph" context="#pop" String="\\N&argsep2;[0-9]+\1"/>
+        <RegExpr attribute="Glyph" context="#pop" String="\\&roffid;"/>
+        <RegExpr attribute="Escape" context="#pop" String="\\$"/>
+        <DetectChar attribute="Error" context="#pop" char="\\"/>
+      </context>
+
+      <!-- directive start -->
+      <context name="DetectDirective" attribute="Other Macros" lineEndContext="#pop">
+        <keyword attribute="Layout Macros" context="Directive" String="layout"/>
+        <keyword attribute="Format Macros" context="Directive" String="formatting"/>
+        <keyword attribute="GNU Macros" context="Directive" String="gnuext"/>
+        <RegExpr attribute="Other Macros" context="dsDirective" String="\s*ds\b" column="1"/>
+        <RegExpr attribute="Other Macros" context="deDirective" String="\s*de\b" column="1" beginRegion="de"/>
+        <RegExpr attribute="Other Macros" context="daDirective" String="\s*da(?=\s+[A-Za-z]+)" column="1" beginRegion="di"/>
+        <RegExpr attribute="Other Macros" context="diDirective" String="\s*di(?=\s+[A-Za-z]+)" column="1" beginRegion="di"/>
+        <RegExpr attribute="Other Macros" context="Directive" String="\s*[A-Za-z]+\b" column="1"/>
+      </context>
+
+      <!-- comment -->
+      <context name="Comment" attribute="Comment" lineEndContext="#pop">
+        <IncludeRules context="##Alerts"/>
+      </context>
+
+      <!-- error -->
+      <context name="Error" attribute="Error" lineEndContext="#stay"/>
+
+      <!-- generic directive -->
+      <context name="Directive" attribute="Identifier" lineEndContext="#pop">
+        <Float attribute="Number" context="#stay"/>
+        <Int attribute="Number" context="#stay"/>
+        <Detect2Chars attribute="Comment" context="Comment" char="\\" char1="&quot;"/>
+        <IncludeRules context="DetectOthers"/>
+      </context>
+
+      <!-- quoted string -->
+      <context name="String" attribute="String" lineEndContext="#pop">
+        <Detect2Chars attribute="Escape" context="#stay" char="\\" char1="&quot;"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+        <IncludeRules context="DetectOthers"/>
+      </context>
+
+      <!-- \!, \? escapes -->
+      <context name="LiteralSL" attribute="Normal Text" lineEndContext="#pop"/>
+      <context name="LiteralIL" attribute="Normal Text" lineEndContext="Error">
+        <Detect2Chars attribute="Escape" context="#stay" char="\\" char1="\\"/>
+        <Detect2Chars attribute="Escape" context="#pop" char="\\" char1="?"/>
+      </context>
+
+      <!-- escape argument -->
+      <context name="Argument" attribute="String" lineEndContext="Error" dynamic="true">
+        <RegExpr attribute="Escape" context="#pop#pop" String="%1" dynamic="true"/>
+        <IncludeRules context="DetectOthers"/>
+      </context>
+
+      <!-- glyph escape argument -->
+      <context name="GlyphArgument" attribute="Glyph" lineEndContext="Error" dynamic="true">
+        <RegExpr attribute="Glyph" context="#pop#pop" String="%1" dynamic="true"/>
+      </context>
+
+      <!-- measurement (or expression) escape argument -->
+      <context name="Measurement" attribute="Error" lineEndContext="Error" dynamic="true">
+        <RegExpr attribute="Escape" context="#pop#pop" String="%1" dynamic="true"/>
+        <!-- TODO -->
+      </context>
+
+      <!-- .de directive -->
+      <context name="deDirective" attribute="Identifier" lineEndContext="deBody"/>
+      <context name="deBody" attribute="Normal Text" lineEndContext="#stay">
+        <Detect2Chars attribute="Other Macros" context="#pop#pop" char="." char1="." column="0" endRegion="de"/>
+        <IncludeRules context="Normal"/>
+      </context>
+
+      <!-- .di directives -->
+      <context name="diDirective" attribute="Identifier" lineEndContext="diBody"/>
+      <context name="diBody" attribute="Normal Text" lineEndContext="#stay">
+        <RegExpr attribute="Other Macros" context="#pop#pop" String="\.\s*di\b" column="0" endRegion="di"/>
+        <Detect2Chars attribute="Escape" context="LiteralSL" char="\\" char1="!"/>
+        <Detect2Chars attribute="Escape" context="LiteralIL" char="\\" char1="?"/>
+        <IncludeRules context="Normal"/>
+      </context>
+
+      <!-- .da directives -->
+      <context name="daDirective" attribute="Identifier" lineEndContext="daBody"/>
+      <context name="daBody" attribute="Normal Text" lineEndContext="#stay">
+        <RegExpr attribute="Other Macros" context="#pop#pop" String="\.\s*da\b" column="0" endRegion="di"/>
+        <Detect2Chars attribute="Escape" context="LiteralSL" char="\\" char1="!"/>
+        <Detect2Chars attribute="Escape" context="LiteralIL" char="\\" char1="?"/>
+        <IncludeRules context="Normal"/>
+      </context>
+
+      <!-- .ds directive -->
+      <context name="dsDirective" attribute="Identifier" lineEndContext="#pop">
+        <Int attribute="Number" context="#stay"/>
+        <Float attribute="Number" context="#stay"/>
+        <Detect2Chars attribute="Comment" context="Comment" char="\\" char1="&quot;"/>
+        <DetectChar attribute="String" context="dsString" char="&quot;"/>
+        <IncludeRules context="DetectOthers"/>
+      </context>
+
+      <!-- .ds quoted value -->
+      <context name="dsString" attribute="String" lineEndContext="#pop">
+        <IncludeRules context="DetectOthers"/>
+      </context>
+
+    </contexts>
+
+    <itemDatas>
+      <itemData name="Normal Text"    defStyleNum="dsNormal"/>
+      <itemData name="Comment"        defStyleNum="dsComment"/>
+      <itemData name="Layout Macros"  defStyleNum="dsKeyword"/>
+      <itemData name="Format Macros"  defStyleNum="dsKeyword"/>
+      <itemData name="GNU Macros"     defStyleNum="dsDataType"/>
+      <itemData name="Other Macros"   defStyleNum="dsFunction"/>
+      <itemData name="Identifier"     defStyleNum="dsString"/>
+      <itemData name="Number"         defStyleNum="dsDecVal"/>
+      <itemData name="Register"       defStyleNum="dsOthers"/>
+      <itemData name="Font"           defStyleNum="dsOthers"/>
+      <itemData name="Glyph"          defStyleNum="dsOthers"/>
+      <itemData name="Escape"         defStyleNum="dsChar"/>
+      <itemData name="String"         defStyleNum="dsString"/>
+      <itemData name="Error"          defStyleNum="dsError"/>
+    </itemDatas>
+
+  </highlighting>
+
+  <general>
+
+    <comments>
+      <comment name="singleLine" start=".\&quot;" />
+    </comments>
+
+    <keywords casesensitive="1"/>
+
+  </general>
+
+</language>
diff --git a/kate/data/rsiidl.xml b/kate/data/rsiidl.xml
index cea37646d..286398710 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.1" section="Sources" extensions="*.pro" mimetype="text/x-rsiidl-src" author="Markus Fraenz (fraenz@linmpi.mpg.de)" license="">
+<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="">
     <highlighting>
         <list name="reserved words">
         <item> For </item>
diff --git a/kate/data/rtf.xml b/kate/data/rtf.xml
new file mode 100644
index 000000000..50ea497bc
--- /dev/null
+++ b/kate/data/rtf.xml
@@ -0,0 +1,49 @@
+<?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.">
+
+  <highlighting>
+    
+    <contexts>
+
+      <context attribute="Text" lineEndContext="#stay" name="context_normal">
+        <DetectChar char="{" attribute="Braces" beginRegion="true" />
+        <DetectChar char="}" attribute="Braces" endRegion="true" />
+        <DetectChar char="\" lookAhead="true" context="context_process_backslash" />
+      </context>
+
+      <context lineEndContext="context_normal" fallthrough="true" fallthroughContext="context_normal" attribute="Numeric parameter" name="context_process_backslash">
+        <Detect2Chars char="\" char1="|" attribute="Control words" />
+        <Detect2Chars char="\" char1="~" attribute="Character" />
+        <Detect2Chars char="\" char1="-" attribute="Character" />
+        <Detect2Chars char="\" char1="_" attribute="Character" />
+        <Detect2Chars char="\" char1=":" attribute="Control words" />
+        <Detect2Chars char="\" char1="*" attribute="Control words" />
+        <Detect2Chars char="\" char1="\" attribute="Character" />
+        <Detect2Chars char="\" char1="{" attribute="Character" />
+        <Detect2Chars char="\" char1="}" attribute="Character" />
+        <RegExpr String="\\u&number;" attribute="Character"/>
+        <RegExpr String="\\'[01-9a-f]{2}" attribute="Character"/>
+        <RegExpr String="\\[a-zA-Z]+" attribute="Control words" context="context_functionparameter" />
+        <DetectChar char="\" attribute="Error" />
+      </context>
+
+      <context attribute="Control words" lineEndContext="context_normal" fallthrough="true" fallthroughContext="context_normal" name="context_functionparameter">
+        <RegExpr String="[-]?\d+" attribute="Numeric parameter" context="context_normal" />
+        <DetectChar char="-" attribute="Error" />
+      </context>
+
+    </contexts>
+    
+    <itemDatas>
+      <itemData name="Text" defStyleNum="dsString"/>
+      <itemData name="Character" defStyleNum="dsChar"/>
+      <itemData name="Braces" defStyleNum="dsKeyword"/>
+      <itemData name="Control words" defStyleNum="dsFunction"/>
+      <itemData name="Numeric parameter" defStyleNum="dsDecVal"/>
+      <itemData name="Error" defStyleNum="dsError"/>
+    </itemDatas>
+    
+  </highlighting>
+  
+</language>
diff --git a/kate/data/sather.xml b/kate/data/sather.xml
index 472ca8788..f2349db21 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.1" section="Sources" extensions="*.sa" mimetype="text/x-sather-src" casesensitive="1">
+<language name="Sather" version="1.03" 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 b2171842f..6d7c1f7c9 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.4" section="Sources"
+<language name="Scala" version="1.0" kateversion="2.3" section="Sources"
           extensions="*.scala" mimetype="text/x-scala" license="LGPL"
           author="Stephane Micheloud (stephane.micheloud@epfl.ch)">
 <!--
@@ -3412,14 +3412,14 @@ adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <Int attribute="Decimal" context="#stay">
-          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+          <StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+          <StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
         </Int>
         <HlCChar attribute="Char" context="#stay"/>
         <RegExpr attribute="Decimal" context="#stay" String="//\s*BEGIN.*$" beginRegion="Region1"/>
diff --git a/kate/data/sci.xml b/kate/data/sci.xml
index 0a792e1bb..177991e54 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.3" section="Scientific" extensions="*.sci;*.sce" mimetype="text/x-sci">
+<language name="scilab" version="1.03" 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/sgml.xml b/kate/data/sgml.xml
index 2292c3195..5d5cc4025 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.1" section="Markup" extensions="*.sgml" mimetype="text/sgml">
+<language name="SGML" version="1.02" 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/sml.xml b/kate/data/sml.xml
index eeae780fc..526cb8e56 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.1" section="Sources" extensions="*.sml;*.ml" mimetype="" author="Christoph Cullmann (cullmann@kde.org)" license="LGPL">
+<language name="SML" version="1.06" 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/sql-mysql.xml b/kate/data/sql-mysql.xml
index f2c180057..585d460c9 100644
--- a/kate/data/sql-mysql.xml
+++ b/kate/data/sql-mysql.xml
@@ -5,7 +5,7 @@
   original by Shane Wright (me@shanewright.co.uk)
   modifications by Milian Wolff (mail@milianw.de)
 -->
-<language name="SQL (MySQL)" version="1.15" kateversion="2.5" section="Database" extensions="*.sql;*.SQL;*.ddl;*.DDL" mimetype="text/x-sql" casesensitive="0" author="Shane Wright (me@shanewright.co.uk)" license="">
+<language name="SQL (MySQL)" version="1.16" kateversion="2.5" 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> ACCESS </item>
@@ -91,8 +91,8 @@
       <item> MASTER_SERVER_ID </item>
       <item> MATCH </item>
       <item> MRG_MYISAM </item>
-      <item> NATURAL </item>
       <item> NATIONAL </item>
+      <item> NATURAL </item>
       <item> NOT </item>
       <item> NULL </item>
       <item> NUMERIC </item>
@@ -183,196 +183,196 @@
     <list name="functions">
       <!-- string functions -->
       <item> ASCII </item>
-      <item> ORD </item>
-      <item> CONV </item>
       <item> BIN </item>
-      <item> OCT </item>
-      <item> HEX </item>
+      <item> BIT_LENGTH </item>
       <item> CHAR </item>
+      <item> CHARACTER_LENGTH </item>
+      <item> CHAR_LENGTH </item>
       <item> CONCAT </item>
       <item> CONCAT_WS </item>
+      <item> CONV </item>
+      <item> ELT </item>
+      <item> EXPORT_SET </item>
+      <item> FIELD </item>
+      <item> FIND_IN_SET </item>
+      <item> HEX </item>
+      <item> INSERT </item>
+      <item> INSTR </item>
+      <item> LCASE </item>
+      <item> LEFT </item>
       <item> LENGTH </item>
-      <item> OCTET_LENGTH </item>
-      <item> CHAR_LENGTH </item>
-      <item> CHARACTER_LENGTH </item>
-      <item> BIT_LENGTH </item>
+      <item> LOAD_FILE </item>
       <item> LOCATE </item>
-      <item> POSITION </item>
-      <item> INSTR </item>
+      <item> LOWER </item>
       <item> LPAD </item>
-      <item> RPAD </item>
-      <item> LEFT </item>
-      <item> RIGHT </item>
-      <item> SUBSTRING </item>
-      <item> SUBSTRING_INDEX </item>
-      <item> MID </item>
       <item> LTRIM </item>
+      <item> MAKE_SET </item>
+      <item> MID </item>
+      <item> OCT </item>
+      <item> OCTET_LENGTH </item>
+      <item> ORD </item>
+      <item> POSITION </item>
+      <item> QUOTE </item>
+      <item> REPEAT </item>
+      <item> REPLACE </item>
+      <item> REVERSE </item>
+      <item> RIGHT </item>
+      <item> RPAD </item>
       <item> RTRIM </item>
-      <item> TRIM </item>
       <item> SOUNDEX </item>
       <item> SPACE </item>
-      <item> REPLACE </item>
-      <item> REPEAT </item>
-      <item> REVERSE </item>
-      <item> INSERT </item>
-      <item> ELT </item>
-      <item> FIELD </item>
-      <item> FIND_IN_SET </item>
-      <item> MAKE_SET </item>
-      <item> EXPORT_SET </item>
-      <item> LCASE </item>
-      <item> LOWER </item>
+      <item> SUBSTRING </item>
+      <item> SUBSTRING_INDEX </item>
+      <item> TRIM </item>
       <item> UCASE </item>
       <item> UPPER </item>
-      <item> LOAD_FILE </item>
-      <item> QUOTE </item>
       <!-- math functions -->
       <item> ABS </item>
-      <item> SIGN </item>
-      <item> MOD </item>
-      <item> FLOOR </item>
+      <item> ACOS </item>
+      <item> ASIN </item>
+      <item> ATAN </item>
+      <item> ATAN2 </item>
       <item> CEILING </item>
-      <item> ROUND </item>
+      <item> COS </item>
+      <item> COT </item>
+      <item> DEGREES </item>
       <item> EXP </item>
+      <item> FLOOR </item>
+      <item> GREATEST </item>
+      <item> LEAST </item>
       <item> LN </item>
       <item> LOG </item>
-      <item> LOG2 </item>
       <item> LOG10 </item>
+      <item> LOG2 </item>
+      <item> MOD </item>
+      <item> PI </item>
       <item> POW </item>
       <item> POWER </item>
-      <item> SQRT </item>
-      <item> PI </item>
-      <item> COS </item>
+      <item> RADIANS </item>
+      <item> RAND </item>
+      <item> ROUND </item>
+      <item> SIGN </item>
       <item> SIN </item>
+      <item> SQRT </item>
       <item> TAN </item>
-      <item> ACOS </item>
-      <item> ASIN </item>
-      <item> ATAN </item>
-      <item> ATAN2 </item>
-      <item> COT </item>
-      <item> RAND </item>
-      <item> LEAST </item>
-      <item> GREATEST </item>
-      <item> DEGREES </item>
-      <item> RADIANS </item>
       <!-- date/time functions -->
-      <item> DAYOFWEEK </item>
-      <item> WEEKDAY </item>
+      <item> ADDDATE </item>
+      <item> CURDATE </item>
+      <item> CURRENT_DATE </item>
+      <item> CURRENT_TIME </item>
+      <item> CURRENT_TIMESTAMP </item>
+      <item> CURTIME </item>
+      <item> DATE_ADD </item>
+      <item> DATE_FORMAT </item>
+      <item> DATE_SUB </item>
+      <item> DAYNAME </item>
       <item> DAYOFMONTH </item>
+      <item> DAYOFWEEK </item>
       <item> DAYOFYEAR </item>
-      <item> MONTH </item>
-      <item> DAYNAME </item>
-      <item> MONTHNAME </item>
-      <item> QUARTER </item>
-      <item> WEEK </item>
-      <item> YEAR </item>
-      <item> YEARWEEK </item>
+      <item> EXTRACT </item>
+      <item> FROM_DAYS </item>
+      <item> FROM_UNIXTIME </item>
       <item> HOUR </item>
       <item> MINUTE </item>
-      <item> SECOND </item>
+      <item> MONTH </item>
+      <item> MONTHNAME </item>
+      <item> NOW </item>
       <item> PERIOD_ADD </item>
       <item> PERIOD_DIFF </item>
-      <item> DATE_ADD </item>
-      <item> DATE_SUB </item>
-      <item> ADDDATE </item>
+      <item> QUARTER </item>
+      <item> SECOND </item>
+      <item> SEC_TO_TIME </item>
       <item> SUBDATE </item>
-      <item> EXTRACT </item>
-      <item> TO_DAYS </item>
-      <item> FROM_DAYS </item>
-      <item> DATE_FORMAT </item>
-      <item> TIME_FORMAT </item>
-      <item> CURDATE </item>
-      <item> CURRENT_DATE </item>
-      <item> CURTIME </item>
-      <item> CURRENT_TIME </item>
-      <item> NOW </item>
       <item> SYSDATE </item>
-      <item> CURRENT_TIMESTAMP </item>
-      <item> UNIX_TIMESTAMP </item>
-      <item> FROM_UNIXTIME </item>
-      <item> SEC_TO_TIME </item>
+      <item> TIME_FORMAT </item>
       <item> TIME_TO_SEC </item>
+      <item> TO_DAYS </item>
+      <item> UNIX_TIMESTAMP </item>
+      <item> WEEK </item>
+      <item> WEEKDAY </item>
+      <item> YEAR </item>
+      <item> YEARWEEK </item>
       <!-- cast functions -->
       <item> CAST </item>
       <item> CONVERT </item>
       <!-- misc -->
+      <item> AES_DECRYPT </item>
+      <item> AES_ENCRYPT </item>
+      <item> BENCHMARK </item>
       <item> BIT_COUNT </item>
+      <item> CONNECTION_ID </item>
       <item> DATABASE </item>
-      <item> USER </item>
-      <item> SYSTEM_USER </item>
-      <item> SESSION_USER </item>
-      <item> PASSWORD </item>
-      <item> ENCRYPT </item>
-      <item> ENCODE </item>
       <item> DECODE </item>
-      <item> MD5 </item>
-      <item> SHA1 </item>
-      <item> SHA </item>
-      <item> AES_ENCRYPT </item>
-      <item> AES_DECRYPT </item>
-      <item> DES_ENCRYPT </item>
       <item> DES_DECRYPT </item>
-      <item> LAST_INSERT_ID </item>
+      <item> DES_ENCRYPT </item>
+      <item> ENCODE </item>
+      <item> ENCRYPT </item>
       <item> FORMAT </item>
-      <item> VERSION </item>
-      <item> CONNECTION_ID </item>
+      <item> FOUND_ROWS </item>
       <item> GET_LOCK </item>
-      <item> RELEASE_LOCK </item>
-      <item> IS_FREE_LOCK </item>
-      <item> BENCHMARK </item>
-      <item> INET_NTOA </item>
       <item> INET_ATON </item>
+      <item> INET_NTOA </item>
+      <item> IS_FREE_LOCK </item>
+      <item> LAST_INSERT_ID </item>
       <item> MASTER_POS_WAIT </item>
-      <item> FOUND_ROWS </item>
+      <item> MD5 </item>
+      <item> PASSWORD </item>
+      <item> RELEASE_LOCK </item>
+      <item> SESSION_USER </item>
+      <item> SHA </item>
+      <item> SHA1 </item>
+      <item> SYSTEM_USER </item>
+      <item> USER </item>
+      <item> VERSION </item>
       <!-- GROUP BY -->
-      <item> COUNT </item>
       <item> AVG </item>
-      <item> MIN </item>
+      <item> BIT_AND </item>
+      <item> BIT_OR </item>
+      <item> COUNT </item>
       <item> MAX </item>
-      <item> SUM </item>
+      <item> MIN </item>
       <item> STD </item>
       <item> STDDEV </item>
-      <item> BIT_OR </item>
-      <item> BIT_AND </item>
+      <item> SUM </item>
     </list>
     <list name="types">
       <!-- strings -->
-      <item> CHAR </item>
-      <item> CHARACTER </item>
-      <item> VARCHAR </item>
       <item> BINARY </item>
-      <item> VARBINARY </item>
-      <item> TINYBLOB </item>
-      <item> MEDIUMBLOB </item>
       <item> BLOB </item>
+      <item> CHAR </item>
+      <item> CHARACTER </item>
+      <item> ENUM </item>
       <item> LONGBLOB </item>
-      <item> TINYTEXT </item>
+      <item> LONGTEXT </item>
+      <item> MEDIUMBLOB </item>
       <item> MEDIUMTEXT </item>
       <item> TEXT </item>
-      <item> LONGTEXT </item>
-      <item> ENUM </item>
+      <item> TINYBLOB </item>
+      <item> TINYTEXT </item>
+      <item> VARBINARY </item>
+      <item> VARCHAR </item>
       <!-- <item> SET </item>
         needs special regexp (see below) -->
       <!-- numeric -->
+      <item> BIGINT </item>
       <item> BIT </item>
       <item> BOOL </item>
       <item> BOOLEAN </item>
-      <item> TINYINT </item>
-      <item> SMALLINT </item>
-      <item> MEDIUMINT </item>
-      <item> MIDDLEINT </item>
-      <item> INT </item>
-      <item> INTEGER </item>
-      <item> BIGINT </item>
-      <item> FLOAT </item>
-      <item> DOUBLE </item>
-      <item> REAL </item>
-      <item> DECIMAL </item>
       <item> DEC </item>
+      <item> DECIMAL </item>
+      <item> DOUBLE </item>
       <item> FIXED </item>
-      <item> NUMERIC </item>
+      <item> FLOAT </item>
+      <item> INT </item>
+      <item> INTEGER </item>
       <item> LONG </item>
+      <item> MEDIUMINT </item>
+      <item> MIDDLEINT </item>
+      <item> NUMERIC </item>
+      <item> TINYINT </item>
+      <item> REAL </item>
       <item> SERIAL </item>
+      <item> SMALLINT </item>
       <!-- date and time -->
       <item> DATE </item>
       <item> DATETIME </item>
@@ -382,7 +382,7 @@
     </list>
     <contexts>
       <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
-        <DetectSpaces />
+        <DetectSpaces/>
         <!-- problematic special cases -->
         <!-- SET type -->
         <RegExpr attribute="Data Type" context="#stay" insensitive="true" String="SET(?=\s*\()"/>
@@ -394,7 +394,7 @@
         <keyword attribute="Function" context="#stay" String="functions"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
 
-        <DetectIdentifier />
+        <DetectIdentifier/>
         <!-- extra data types -->
         <RegExpr attribute="Data Type" context="#stay" String="%(?:bulk_(?:exceptions|rowcount)|found|isopen|notfound|rowcount|rowtype|type)\b" insensitive="true"/>
         <!-- numbers -->
@@ -447,20 +447,20 @@
       <context name="Preprocessor" attribute="Preprocessor" lineEndContext="#pop"/>
     </contexts>
     <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
-      <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
-      <itemData name="Operator" defStyleNum="dsNormal" spellChecking="false"/>
-      <itemData name="Function" defStyleNum="dsFunction" spellChecking="false"/>
-      <itemData name="Data Type" defStyleNum="dsDataType" spellChecking="false"/>
-      <itemData name="Decimal"  defStyleNum="dsDecVal" spellChecking="false"/>
-      <itemData name="Float"  defStyleNum="dsFloat" spellChecking="false"/>
-      <itemData name="Hex" defStyleNum="dsBaseN" spellChecking="false"/>
-      <itemData name="String" defStyleNum="dsString"/>
+      <itemData name="Normal Text"       defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Keyword"           defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Operator"          defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Function"          defStyleNum="dsFunction" spellChecking="false"/>
+      <itemData name="Data Type"         defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Decimal"           defStyleNum="dsDecVal" spellChecking="false"/>
+      <itemData name="Hex"               defStyleNum="dsBaseN" spellChecking="false"/>
+      <itemData name="Float"             defStyleNum="dsFloat" spellChecking="false"/>
       <itemData name="Name" color="#080" defStyleNum="dsString" spellChecking="false"/>
-      <itemData name="String Char" defStyleNum="dsChar" spellChecking="false"/>
-      <itemData name="Comment" defStyleNum="dsComment"/>
-      <itemData name="Symbol"  defStyleNum="dsChar" spellChecking="false"/>
-      <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/>
+      <itemData name="String"            defStyleNum="dsString"/>
+      <itemData name="String Char"       defStyleNum="dsChar" spellChecking="false"/>
+      <itemData name="Comment"           defStyleNum="dsComment"/>
+      <itemData name="Symbol"            defStyleNum="dsChar" spellChecking="false"/>
+      <itemData name="Preprocessor"      defStyleNum="dsOthers" spellChecking="false"/>
     </itemDatas>
   </highlighting>
   <general>
@@ -472,4 +472,3 @@
     <folding indentationsensitive="true"/>
   </general>
 </language>
-
diff --git a/kate/data/sql-postgresql.xml b/kate/data/sql-postgresql.xml
index 9c88c7fd1..a8b1101ac 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.12" 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="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="">
   <highlighting>
     <list name="keywords">
       <item> ABORT </item>
@@ -48,12 +48,12 @@
       <item> CATALOG </item>
       <item> CATALOG_NAME </item>
       <item> CHAIN </item>
-      <item> CHAR_LENGTH </item>
+      <item> CHARACTERISTICS </item>
       <item> CHARACTER_LENGTH </item>
       <item> CHARACTER_SET_CATALOG </item>
       <item> CHARACTER_SET_NAME </item>
       <item> CHARACTER_SET_SCHEMA </item>
-      <item> CHARACTERISTICS </item>
+      <item> CHAR_LENGTH </item>
       <item> CHECK </item>
       <item> CHECKED </item>
       <item> CHECKPOINT </item>
@@ -81,11 +81,11 @@
       <item> CONNECT </item>
       <item> CONNECTION </item>
       <item> CONNECTION_NAME </item>
+      <item> CONSTRAINTS </item>
       <item> CONSTRAINT </item>
       <item> CONSTRAINT_CATALOG </item>
       <item> CONSTRAINT_NAME </item>
       <item> CONSTRAINT_SCHEMA </item>
-      <item> CONSTRAINTS </item>
       <item> CONSTRUCTOR </item>
       <item> CONTAINS </item>
       <item> CONTINUE </item>
@@ -163,6 +163,7 @@
       <item> EXISTS </item>
       <item> EXPLAIN </item>
       <item> EXTERNAL </item>
+      <item> FALSE </item>
       <item> FETCH </item>
       <item> FINAL </item>
       <item> FIRST </item>
@@ -315,13 +316,13 @@
       <item> OWNER </item>
       <item> PAD </item>
       <item> PARAMETER </item>
+      <item> PARAMETERS </item>
       <item> PARAMETER_MODE </item>
       <item> PARAMETER_NAME </item>
       <item> PARAMETER_ORDINAL_POSITION </item>
       <item> PARAMETER_SPECIFIC_CATALOG </item>
       <item> PARAMETER_SPECIFIC_NAME </item>
       <item> PARAMETER_SPECIFIC_SCHEMA </item>
-      <item> PARAMETERS </item>
       <item> PARTIAL </item>
       <item> PASCAL </item>
       <item> PASSWORD </item>
@@ -371,8 +372,8 @@
       <item> ROUTINE_NAME </item>
       <item> ROUTINE_SCHEMA </item>
       <item> ROW </item>
-      <item> ROW_COUNT </item>
       <item> ROWS </item>
+      <item> ROW_COUNT </item>
       <item> RULE </item>
       <item> SAVEPOINT </item>
       <item> SCALE </item>
@@ -404,8 +405,8 @@
       <item> SOURCE </item>
       <item> SPACE </item>
       <item> SPECIFIC </item>
-      <item> SPECIFIC_NAME </item>
       <item> SPECIFICTYPE </item>
+      <item> SPECIFIC_NAME </item>
       <item> SQL </item>
       <item> SQLCODE </item>
       <item> SQLERROR </item>
@@ -444,9 +445,9 @@
       <item> TOAST </item>
       <item> TRAILING </item>
       <item> TRANSACTION </item>
-      <item> TRANSACTION_ACTIVE </item>
       <item> TRANSACTIONS_COMMITTED </item>
       <item> TRANSACTIONS_ROLLED_BACK </item>
+      <item> TRANSACTION_ACTIVE </item>
       <item> TRANSFORM </item>
       <item> TRANSFORMS </item>
       <item> TRANSLATE </item>
@@ -457,6 +458,7 @@
       <item> TRIGGER_NAME </item>
       <item> TRIGGER_SCHEMA </item>
       <item> TRIM </item>
+      <item> TRUE </item>
       <item> TRUNCATE </item>
       <item> TRUSTED </item>
       <item> TYPE </item>
@@ -498,10 +500,8 @@
       <item> WRITE </item>
       <item> YEAR </item>
       <item> ZONE </item>
-      <item> FALSE </item>
-      <item> TRUE </item>
     </list>
-  <list name="operators">
+    <list name="operators">
       <item> + </item>
       <item> - </item>
       <item> * </item>
@@ -557,8 +557,8 @@
       <!-- network address type -->
       <item> &lt;&lt;= </item>
       <item> &gt;&gt;= </item>
-   </list>
-     <list name="functions">
+    </list>
+    <list name="functions">
       <!-- math -->
       <item> ABS </item>
       <item> CBRT </item>
@@ -683,57 +683,57 @@
       <item> VARIANCE </item>
     </list>
     <list name="types">
-      <item> LZTEXT </item>
       <item> BIGINT </item>
-      <item> INT2 </item>
-      <item> INT8 </item>
       <item> BIGSERIAL </item>
-      <item> SERIAL8 </item>
       <item> BIT </item>
       <item> BIT VARYING </item>
-      <item> VARBIT </item>
-      <item> BOOLEAN </item>
       <item> BOOL </item>
+      <item> BOOLEAN </item>
       <item> BOX </item>
       <item> BYTEA </item>
-      <item> CHARACTER </item>
       <item> CHAR </item>
+      <item> CHARACTER </item>
       <item> CHARACTER VARYING </item>
-      <item> VARCHAR </item>
       <item> CIDR </item>
       <item> CIRCLE </item>
       <item> DATE </item>
+      <item> DECIMAL </item>
       <item> DOUBLE PRECISION </item>
       <item> FLOAT8 </item>
       <item> INET </item>
-      <item> INTEGER </item>
       <item> INT </item>
+      <item> INT2 </item>
       <item> INT4 </item>
+      <item> INT8 </item>
+      <item> INTEGER </item>
       <item> INTERVAL </item>
       <item> LINE </item>
       <item> LSEG </item>
+      <item> LZTEXT </item>
       <item> MACADDR </item>
       <item> MONEY </item>
       <item> NUMERIC </item>
-      <item> DECIMAL </item>
       <item> OID </item>
       <item> PATH </item>
       <item> POINT </item>
       <item> POLYGON </item>
       <item> REAL </item>
-      <item> SMALLINT </item>
       <item> SERIAL </item>
+      <item> SERIAL8 </item>
+      <item> SMALLINT </item>
       <item> TEXT </item>
       <item> TIME </item>
-      <item> TIMETZ </item>
       <item> TIMESTAMP </item>
-      <item> TIMESTAMPTZ </item>
       <item> TIMESTAMP WITH TIMEZONE </item>
+      <item> TIMESTAMPTZ </item>
+      <item> TIMETZ </item>
+      <item> VARBIT </item>
+      <item> VARCHAR </item>
     </list>
     <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" />
+        <StringDetect String="CREATE FUNCTION" context="CreateFunction" attribute="Keyword"/>
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Operator" context="#stay" String="operators"/>
         <keyword attribute="Function" context="#stay" String="functions"/>
@@ -760,15 +760,15 @@
         <RegExpr attribute="Operator" context="MultiLineString" String="\$([^\$\n\r]*)\$" dynamic="true"/>
       </context>
       <context name="CreateFunction" attribute="Normal Text" lineEndContext="#stay">
-          <RegExpr attribute="Function" context="FunctionBody" String="\$([^\$\n\r]*)\$" dynamic="true"/>
-          <IncludeRules context="Normal" />
+        <RegExpr attribute="Function" context="FunctionBody" String="\$([^\$\n\r]*)\$" dynamic="true"/>
+        <IncludeRules context="Normal"/>
       </context>
       <context name="FunctionBody" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-          <RegExpr attribute="Function" context="#pop#pop" String="\$%1\$" dynamic="true"/>
-          <IncludeRules context="Normal" />
+        <RegExpr attribute="Function" context="#pop#pop" String="\$%1\$" dynamic="true"/>
+        <IncludeRules context="Normal"/>
       </context>
       <context name="MultiLineString" attribute="String" lineEndContext="#stay" dynamic="true">
-          <RegExpr attribute="Operator" context="#pop" String="\$%1\$" dynamic="true"/>
+        <RegExpr attribute="Operator" context="#pop" String="\$%1\$" dynamic="true"/>
       </context>
       <context name="String" attribute="String" lineEndContext="#stay">
         <LineContinue attribute="String" context="#pop"/>
@@ -787,19 +787,19 @@
       <context name="Preprocessor" attribute="Preprocessor" lineEndContext="#pop"/>
     </contexts>
     <itemDatas>
-      <itemData name="Normal Text" defStyleNum="dsNormal"/>
-      <itemData name="Keyword" defStyleNum="dsKeyword"/>
-      <itemData name="Operator" defStyleNum="dsNormal"/>
-      <itemData name="Function" defStyleNum="dsFunction"/>
-      <itemData name="Data Type" defStyleNum="dsDataType"/>
-      <itemData name="Decimal"  defStyleNum="dsDecVal"/>
-      <itemData name="Float"  defStyleNum="dsFloat"/>
-      <itemData name="String" defStyleNum="dsString"/>
-      <itemData name="String Char" defStyleNum="dsChar"/>
-      <itemData name="Comment" defStyleNum="dsComment"/>
-      <itemData name="Identifier" defStyleNum="dsOthers"/>
-      <itemData name="Symbol"  defStyleNum="dsChar"/>
-      <itemData name="Preprocessor" defStyleNum="dsOthers"/>
+      <itemData name="Normal Text"       defStyleNum="dsNormal"/>
+      <itemData name="Keyword"           defStyleNum="dsKeyword"/>
+      <itemData name="Operator"          defStyleNum="dsNormal"/>
+      <itemData name="Function"          defStyleNum="dsFunction"/>
+      <itemData name="Data Type"         defStyleNum="dsDataType"/>
+      <itemData name="Decimal"           defStyleNum="dsDecVal"/>
+      <itemData name="Float"             defStyleNum="dsFloat"/>
+      <itemData name="String"            defStyleNum="dsString"/>
+      <itemData name="String Char"       defStyleNum="dsChar"/>
+      <itemData name="Comment"           defStyleNum="dsComment"/>
+      <itemData name="Identifier"        defStyleNum="dsOthers"/>
+      <itemData name="Symbol"            defStyleNum="dsChar"/>
+      <itemData name="Preprocessor"      defStyleNum="dsOthers"/>
     </itemDatas>
   </highlighting>
   <general>
@@ -807,6 +807,6 @@
       <comment name="singleLine" start="--"/>
       <comment name="multiLine" start="/*" end="*/"/>
     </comments>
-    <keywords casesensitive="0" weakDeliminator="+-*/|!@&amp;#&lt;&gt;%^=~:.?"/>
+    <keywords casesensitive="0" weakDeliminator="+-*/|=!&lt;&gt;~^:.@&amp;#%?"/>
   </general>
 </language>
diff --git a/kate/data/sql.xml b/kate/data/sql.xml
index 644967314..316eed422 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.16" 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="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">
   <highlighting>
     <list name="keywords">
       <item> ACCESS </item>
@@ -15,8 +15,8 @@
       <item> AFTER </item>
       <item> AGENT </item>
       <item> ALL </item>
-      <item> ALL_ROWS </item>
       <item> ALLOCATE </item>
+      <item> ALL_ROWS </item>
       <item> ALTER </item>
       <item> ANALYZE </item>
       <item> ANCILLARY </item>
@@ -49,8 +49,8 @@
       <item> BLOCK </item>
       <item> BLOCK_RANGE </item>
       <item> BODY </item>
-      <item> BOUND </item>
       <item> BOTH </item>
+      <item> BOUND </item>
       <item> BREAK </item>
       <item> BROADCAST </item>
       <item> BTITLE </item>
@@ -282,12 +282,12 @@
       <item> MAXSIZE </item>
       <item> MAXTRANS </item>
       <item> MAXVALUE </item>
-      <item> METHOD </item>
       <item> MEMBER </item>
       <item> MERGE </item>
+      <item> METHOD </item>
+      <item> MINEXTENTS </item>
       <item> MINIMIZE </item>
       <item> MINIMUM </item>
-      <item> MINEXTENTS </item>
       <item> MINUS </item>
       <item> MINUTE </item>
       <item> MINVALUE </item>
@@ -482,8 +482,8 @@
       <item> SERIALIZABLE </item>
       <item> SERVERERROR </item>
       <item> SESSION </item>
-      <item> SESSION_CACHED_CURSORS </item>
       <item> SESSIONS_PER_USER </item>
+      <item> SESSION_CACHED_CURSORS </item>
       <item> SET </item>
       <item> SHARE </item>
       <item> SHARED </item>
@@ -505,8 +505,8 @@
       <item> START </item>
       <item> STARTUP </item>
       <item> STATEMENT_ID </item>
-      <item> STATISTICS </item>
       <item> STATIC </item>
+      <item> STATISTICS </item>
       <item> STOP </item>
       <item> STORAGE </item>
       <item> STORE </item>
@@ -519,14 +519,14 @@
       <item> SUPPLEMENTAL </item>
       <item> SUSPEND </item>
       <item> SWITCH </item>
-      <item> SYS_OP_BITVEC </item>
-      <item> SYS_OP_ENFORCE_NOT_NULL$ </item>
-      <item> SYS_OP_NOEXPAND </item>
-      <item> SYS_OP_NTCIMG$ </item>
       <item> SYNONYM </item>
       <item> SYSDBA </item>
       <item> SYSOPER </item>
       <item> SYSTEM </item>
+      <item> SYS_OP_BITVEC </item>
+      <item> SYS_OP_ENFORCE_NOT_NULL$ </item>
+      <item> SYS_OP_NOEXPAND </item>
+      <item> SYS_OP_NTCIMG$ </item>
       <item> TABLE </item>
       <item> TABLES </item>
       <item> TABLESPACE </item>
@@ -569,14 +569,14 @@
       <item> UNTIL </item>
       <item> UNUSABLE </item>
       <item> UNUSED </item>
-      <item> UPD_INDEXES </item>
       <item> UPDATABLE </item>
       <item> UPDATE </item>
+      <item> UPD_INDEXES </item>
       <item> UPPPER </item>
       <item> USAGE </item>
       <item> USE </item>
-      <item> USE_STORED_OUTLINES </item>
       <item> USER_DEFINED </item>
+      <item> USE_STORED_OUTLINES </item>
       <item> USING </item>
       <item> VALIDATE </item>
       <item> VALIDATION </item>
@@ -864,8 +864,8 @@
       <item> PLS_INTEGER </item>
       <item> PRECISION </item>
       <item> RAW </item>
-      <item> RECORD </item>
       <item> REAL </item>
+      <item> RECORD </item>
       <item> ROWID </item>
       <item> SECOND </item>
       <item> SINGLE </item>
@@ -877,48 +877,50 @@
       <item> UROWID </item>
       <item> VARCHAR </item>
       <item> VARCHAR2 </item>
-      <item> VARYING </item>
       <item> VARRAY </item>
+      <item> VARYING </item>
       <item> XMLTYPE </item>
       <item> YEAR </item>
       <item> ZONE </item>
     </list>
     <contexts>
       <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
-        <DetectSpaces />
+        <DetectSpaces/>
 
         <keyword attribute="Keyword" String="keywords" context="#stay"/>
         <keyword attribute="Operator" String="operators" context="#stay"/>
         <keyword attribute="Function" String="functions" context="#stay"/>
         <keyword attribute="Data Type" String="types" context="#stay"/>
 
-        <DetectIdentifier />
-
+        <DetectIdentifier/>
+        <!-- extra data types -->
         <RegExpr attribute="Data Type" context="#stay" String="%(?:bulk_(?:exceptions|rowcount)|found|isopen|notfound|rowcount|rowtype|type)\b" insensitive="true"/>
-
+        <!-- numbers -->
         <HlCHex attribute="Hex" context="#stay"/>
         <Float attribute="Float" context="#stay"/>
         <Int attribute="Decimal" context="#stay"/>
-
+        <!-- strings -->
         <DetectChar attribute="String" context="String literal" char="'"/>
+        <!-- comments -->
         <Detect2Chars attribute="Comment" context="Singleline PL/SQL-style comment" char="-" char1="-"/>
-        <Detect2Chars attribute="Comment" context="Multiline C-style comment" char="/" char1="*"/>
+        <Detect2Chars attribute="Comment" context="Multiline C-style comment" char="/" char1="*" beginRegion="Comment"/>
         <RegExpr attribute="Comment" context="SQL*Plus remark directive" String="^rem\b" insensitive="true" column="0"/>
+
         <DetectChar attribute="Identifier" context="User-defined identifier" char="&quot;"/>
         <RegExpr attribute="External Variable" context="#stay" String="(:|&amp;&amp;?)\w+"/>
         <RegExpr attribute="Symbol" context="#stay" String="^/$" column="0"/>
         <RegExpr attribute="Preprocessor" context="SQL*Plus directive to include file" String="^@@?[^@ \t\r\n]" column="0"/>
       </context>
       <context name="String literal" attribute="String" lineEndContext="#stay">
-        <Detect2Chars attribute="String" context="#pop" char="\" char1="'" />
+        <Detect2Chars attribute="String" context="#pop" char="\" char1="'"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
         <RegExpr attribute="External Variable" context="#stay" String="&amp;&amp;?\w+"/>
-        <Detect2Chars attribute="String Char" context="#stay" char="'" char1="'" />
+        <Detect2Chars attribute="String Char" context="#stay" char="'" char1="'"/>
         <DetectChar attribute="String" context="#pop" char="'"/>
       </context>
       <context name="Singleline PL/SQL-style comment" attribute="Comment" lineEndContext="#pop"/>
       <context name="Multiline C-style comment" attribute="Comment" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/"/>
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
       </context>
       <context name="SQL*Plus remark directive" attribute="Comment" lineEndContext="#pop"/>
       <context name="User-defined identifier" attribute="Identifier" lineEndContext="#pop">
@@ -933,7 +935,7 @@
       <itemData name="Function"          defStyleNum="dsFunction"/>
       <itemData name="Data Type"         defStyleNum="dsDataType"/>
       <itemData name="Decimal"           defStyleNum="dsDecVal"/>
-      <itemData name="Hex"             defStyleNum="dsBaseN"/>
+      <itemData name="Hex"               defStyleNum="dsBaseN"/>
       <itemData name="Float"             defStyleNum="dsFloat"/>
       <itemData name="String"            defStyleNum="dsString"/>
       <itemData name="String Char"       defStyleNum="dsChar"/>
diff --git a/kate/data/stata.xml b/kate/data/stata.xml
index f28600e82..f8320de50 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.4" section="Sources" extensions="*.do; *.ado; *.doh; *.DO; *.ADO; *.DOH"
+<language name="Stata" version="2.00" 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/template-toolkit.xml b/kate/data/template-toolkit.xml
index 7e6821001..2bc1735e6 100644
--- a/kate/data/template-toolkit.xml
+++ b/kate/data/template-toolkit.xml
@@ -16,9 +16,9 @@
     Changelog :)
     0.02 Added highliting for interpolated variables
         -->
-<language version="0.03-2" kateversion="2.4"
+<language version="0.03-2" kateversion="2.3"
           author="Красимир Беров (k.berov@gmail.com)" license="Artistic"
-          name="TT2" section="Markup" extensions="*.tt*;" casesensitive="TRUE">
+          name="TT2" section="Markup" extensions="*.tt*;" casesensitive="true">
 <highlighting>
     <list name="control structures">
         <!-- Template directives -->
@@ -183,7 +183,7 @@
     <contexts>
         <context name="nosource" attribute="Normal Text" lineEndContext="#stay">
             <StringDetect attribute="Keyword" context="tt2source" String="[%" />
-            <RegExpr attribute="HTML Tag" context="scripts" String="&lt;\s*script(\s|&gt;)" insensitive="TRUE" />
+            <RegExpr attribute="HTML Tag" context="scripts" String="&lt;\s*script(\s|&gt;)" insensitive="true" />
             <RegExpr attribute="HTML Tag" context="htmltag" String="&lt;\s*\/?\s*[a-zA-Z_:][a-zA-Z0-9._:-]*" />
             <StringDetect attribute="HTML Comment" context="htmlcomment" String="&lt;!--" />
             <!-- Interpolated variables -->
@@ -208,13 +208,13 @@
             <AnyChar attribute="Other" context="#stay" String=";()}{:,[]" />
             <keyword attribute="Other" context="#stay" String="Others" />
             
-            <RegExpr attribute="Control Structures" context="#stay" String="\bELSIF\b" insensitive="FALSE" beginRegion="iffi1" endRegion="iffi1"/>
-            <RegExpr attribute="Control Structures" context="#stay" String="\bELSE\b" insensitive="FALSE" beginRegion="iffi1" endRegion="iffi1"/>
-            <RegExpr attribute="Control Structures" context="#stay" String="\bIF\b" insensitive="FALSE" beginRegion="iffi1"/>
-            <RegExpr attribute="Control Structures" context="#stay" String="\bEND\b" insensitive="FALSE" endRegion="iffi1"/>
+            <RegExpr attribute="Control Structures" context="#stay" String="\bELSIF\b" insensitive="false" beginRegion="iffi1" endRegion="iffi1"/>
+            <RegExpr attribute="Control Structures" context="#stay" String="\bELSE\b" insensitive="false" beginRegion="iffi1" endRegion="iffi1"/>
+            <RegExpr attribute="Control Structures" context="#stay" String="\bIF\b" insensitive="false" beginRegion="iffi1"/>
+            <RegExpr attribute="Control Structures" context="#stay" String="\bEND\b" insensitive="false" endRegion="iffi1"/>
 
-            <RegExpr attribute="Control Structures" context="#stay" String="\bFOREACH\b" insensitive="FALSE" beginRegion="foreachblock"/>
-            <RegExpr attribute="Control Structures" context="#stay" String="\bEND\b" insensitive="FALSE" endRegion="foreachblock"/>
+            <RegExpr attribute="Control Structures" context="#stay" String="\bFOREACH\b" insensitive="false" beginRegion="foreachblock"/>
+            <RegExpr attribute="Control Structures" context="#stay" String="\bEND\b" insensitive="false" endRegion="foreachblock"/>
 
             
             <keyword attribute="Keyword" context="#stay" String="keywords" />
@@ -276,7 +276,7 @@
             <keyword attribute="Keyword" context="#stay" String="keywords" />
             <keyword attribute="Function" context="#stay" String="functions" />
             <StringDetect attribute="Keyword" context="tt2source" String="[%"/>
-            <RegExpr attribute="HTML Tag" context="#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="TRUE" />
+            <RegExpr attribute="HTML Tag" context="#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="true" />
             
             <DetectChar attribute="String" context="doublequotestring" char="&quot;" />
             <DetectChar attribute="String" context="singlequotestring" char="&#39;" />
@@ -290,7 +290,7 @@
             <keyword attribute="Other" context="#stay" String="Others" />
         </context>
         <context name="scripts_onelinecomment" attribute="Comment" lineEndContext="#pop">
-            <RegExpr attribute="HTML Tag" context="#pop#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="TRUE" />
+            <RegExpr attribute="HTML Tag" context="#pop#pop" String="&lt;\s*\/\s*script\s*&gt;" insensitive="true" />
         </context>
         <context name="twolinecomment" attribute="Comment" lineEndContext="#stay">
             <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" />
diff --git a/kate/data/texinfo.xml b/kate/data/texinfo.xml
index d827a7a0f..69e411870 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.3">
+<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">
 
   <highlighting>
     <!--
diff --git a/kate/data/tibasic.xml b/kate/data/tibasic.xml
index 0b2d67dbd..86fbc7e07 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.3" section="Scientific" extensions="">
+<language name="TI Basic" version="1.01" 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 db29db381..d28b78172 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -1,14 +1,15 @@
 <!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="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.09-1"/>
+<Definition name="Alerts_indent" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/alert_indent.xml" version="1.10-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.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"/>
 <Definition name="Ansys" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ansys.xml" version="1.2"/>
 <Definition name="Apache Configuration" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/apache.xml" version="1.11"/>
@@ -19,7 +20,7 @@
 <Definition name="ASN.1" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/asn1.xml" version="1.01-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="AWK" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/awk.xml" version="0.92"/>
+<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="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"/>
@@ -43,37 +44,42 @@
 <Definition name="C#" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cs.xml" version="1.15"/>
 <Definition name="CUE Sheet" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/cue.xml" version="0.91"/>
 <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.45"/>
+<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.69"/>
 <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.05-1"/>
-<Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.11"/>
+<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="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"/>
 <Definition name="DoxygenLua" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/doxygenlua.xml" version="1.01"/>
-<Definition name="Doxygen" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/doxygen.xml" version="1.36-1"/>
+<Definition name="Doxygen" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/doxygen.xml" version="1.38-1"/>
 <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.00"/>
+<Definition name="Email" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/email.xml" version="1.01"/>
 <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.08-2"/>
 <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"/>
 <Definition name="4GL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/fgl-4gl.xml" version="1.02"/>
 <Definition name="4GL-PER" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/fgl-per.xml" version="1.02"/>
 <Definition name="Fortran" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/fortran.xml" version="1.13"/>
-<Definition name="FreeBASIC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/freebasic.xml" version="0.14"/>
-<Definition name="FSharp" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/fsharp.xml" version="0.0.1"/>
+<Definition name="FreeBASIC" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/freebasic.xml" version="0.15"/>
+<Definition name="FSharp" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/fsharp.xml" version="0.1"/>
 <Definition name="fstab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/fstab.xml" version="1.00"/>
+<Definition name="FTL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ftl.xml" version="1.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="GNU Gettext" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gettext.xml" version="2.00-1"/>
+<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="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.03"/>
 <Definition name="GNU Assembler" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/gnuassembler.xml" version="1.10-1"/>
@@ -81,52 +87,63 @@
 <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="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.2"/>
+<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="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"/>
-<Definition name="ISO C++" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/isocpp.xml" version="2.4-1"/>
-<Definition name="Jam" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/jam.xml" version="0.3"/>
-<Definition name="Javadoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/javadoc.xml" version="1.04"/>
+<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="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="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="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="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="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.0.2-1"/>
+<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="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="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="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="Mathematica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mathematica.xml" version="8.0.4"/>
+<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="Maxima" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/maxima.xml" version="0.16-2"/>
+<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="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="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.06"/>
+<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"/>
@@ -135,12 +152,12 @@
 <Definition name="Objective-C" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/objectivec.xml" version="1.07-1"/>
 <Definition name="Objective Caml" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ocaml.xml" version="1.05"/>
 <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="1.1"/>
+<Definition name="OORS" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/oors.xml" version="1.2"/>
 <Definition name="OPAL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/opal.xml" version="1.1"/>
 <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="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.29-2"/>
+<Definition name="Perl" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/perl.xml" version="1.30-1"/>
 <Definition name="PGN" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/pgn.xml" version="2.01-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"/>
@@ -150,24 +167,28 @@
 <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.1"/>
 <Definition name="progress" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/progress.xml" version="1.10"/>
-<Definition name="Prolog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/prolog.xml" version="1.2-1"/>
+<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="3.91"/>
-<Definition name="Python" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/python.xml" version="2.22"/>
+<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="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="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.4"/>
 <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="0.11"/>
 <Definition name="RPM Spec" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/rpmspec.xml" version="2.03"/>
 <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="Ruby" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ruby.xml" version="1.27"/>
 <Definition name="R Script" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/r.xml" version="2.07-1"/>
 <Definition name="Sather" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sather.xml" version="1.03"/>
@@ -181,9 +202,9 @@
 <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="SQL (MySQL)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql-mysql.xml" version="1.15"/>
-<Definition name="SQL (PostgreSQL)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql-postgresql.xml" version="1.12"/>
-<Definition name="SQL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql.xml" version="1.16"/>
+<Definition name="SQL (MySQL)" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/sql-mysql.xml" version="1.16"/>
+<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"/>
@@ -214,7 +235,7 @@
 <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.03-1"/>
+<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"/>
diff --git a/kate/data/uscript.xml b/kate/data/uscript.xml
index e4c7b567d..e905a77f1 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.3" section="Scripts" extensions="*.uc" mimetype="text/x-uscript">
+<language name="UnrealScript" version="0.92" kateversion="2.2" section="Scripts" extensions="*.uc" mimetype="text/x-uscript">
 	<highlighting>
 		<list name="keywords">
 			<item> break </item>
@@ -122,14 +122,14 @@
 				<HlCOct attribute="Octal" context="#stay"/>
 				<HlCHex attribute="Hex" context="#stay"/>
 				<Int attribute="Decimal" context="#stay">
-					<StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="U" insensitive="TRUE"/>
-					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="TRUE"/>
+					<StringDetect attribute="Decimal" context="#stay" String="ULL" insensitive="true"/>
+					<StringDetect attribute="Decimal" context="#stay" String="LUL" insensitive="true"/>
+					<StringDetect attribute="Decimal" context="#stay" String="LLU" insensitive="true"/>
+					<StringDetect attribute="Decimal" context="#stay" String="UL" insensitive="true"/>
+					<StringDetect attribute="Decimal" context="#stay" String="LU" insensitive="true"/>
+					<StringDetect attribute="Decimal" context="#stay" String="LL" insensitive="true"/>
+					<StringDetect attribute="Decimal" context="#stay" String="U" insensitive="true"/>
+					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
 				</Int>
 				<HlCChar attribute="Char" context="#stay"/>
 				<RegExpr attribute="Region Marker" context="#stay" String="//BEGIN.*$" beginRegion="Region1"/>
@@ -141,7 +141,7 @@
 				<DetectChar attribute="Normal Text" context="#stay" char="{" beginRegion="Brace1"/>
 				<DetectChar attribute="Normal Text" context="#stay" char="}" endRegion="Brace1"/>
 				<AnyChar attribute="Symbol" context="#stay" String="!%&amp;()+,-&lt;=&gt;?[]^{|}~"/>
-				<StringDetect attribute="Preprocessor" context="Preprocessor" insensitive="TRUE" String="#exec"/>
+				<StringDetect attribute="Preprocessor" context="Preprocessor" insensitive="true" String="#exec"/>
 			</context>
 			<context attribute="String" lineEndContext="#pop" name="String">
 				<LineContinue attribute="String" context="#stay"/>
diff --git a/kate/data/valgrind-suppression.xml b/kate/data/valgrind-suppression.xml
index 9ac949841..6ba52085c 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.0" author="Milian Wolff (mail@milianw.de)" license="LGPL">
+<language name="Valgrind Suppression" section="Other" extensions="*.supp;" mimetype="" version="1.0" kateversion="2.4" author="Milian Wolff (mail@milianw.de)" license="LGPL">
 <highlighting>
 <contexts>
   <context name="File" attribute="Normal Text" lineEndContext="#stay">
diff --git a/kate/data/velocity.xml b/kate/data/velocity.xml
index dc2424ec5..3bf4affe6 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.1" section="Scripts" extensions="*.vm;" mimetype="text/x-velocity-src;text/x-vm-src" author="John Christopher (John@animalsinneed.net)" license="">
+<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="">
 	<highlighting>
 		<list name="keywords">
 			<item> #set </item>
diff --git a/kate/data/vera.xml b/kate/data/vera.xml
index aadb4b4a6..455f977c6 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.5" section="Hardware" extensions="*.vr;*.vri;*.vrh" mimetype="text/x-vera-src" author="Sean O'Boyle (seanoboyle@intelligentdv.com)" license="GPL">
+<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">
   <highlighting>
     <list name="keywords">
        <item>after</item>
diff --git a/kate/data/vrml.xml b/kate/data/vrml.xml
index 40bdea3d6..6529d5e50 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.0" section="Markup" extensions="*.wrl" mimetype="model/vrml" author="Volker Krause (vkrause@kde.org)" license="LGPL">
+<language name="VRML" version="1.02" kateversion="2.3" section="Markup" 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/wml.xml b/kate/data/wml.xml
index a7ad75677..2aaeba5da 100644
--- a/kate/data/wml.xml
+++ b/kate/data/wml.xml
@@ -55,7 +55,7 @@
 -->
 
 <language name="Wesnoth Markup Language" section="Markup" extensions="*.cfg;*.pbl;*.CFG;*.PBL" version="0.42"
-          kateversion="2.5" 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">
+          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">
             <item> wmllint</item>
diff --git a/kate/data/xharbour.xml b/kate/data/xharbour.xml
index 02ed03ee0..4646249ca 100644
--- a/kate/data/xharbour.xml
+++ b/kate/data/xharbour.xml
@@ -467,21 +467,21 @@
          <DetectChar attribute="String" context="string" char="&quot;" />
          <DetectChar attribute="String" context="stringc" char="'" />
 
-         <StringDetect attribute="Operator" context="#stay" String=".and." insensitive="TRUE"/>
-         <StringDetect attribute="Operator" context="#stay" String=".or." insensitive="TRUE"/>
-         <StringDetect attribute="Operator" context="#stay" String=".not." insensitive="TRUE"/>
-         <StringDetect attribute="Operator" context="#stay" String=".f." insensitive="TRUE"/>
-         <StringDetect attribute="Operator" context="#stay" String=".t." insensitive="TRUE"/>
+         <StringDetect attribute="Operator" context="#stay" String=".and." insensitive="true"/>
+         <StringDetect attribute="Operator" context="#stay" String=".or." insensitive="true"/>
+         <StringDetect attribute="Operator" context="#stay" String=".not." insensitive="true"/>
+         <StringDetect attribute="Operator" context="#stay" String=".f." insensitive="true"/>
+         <StringDetect attribute="Operator" context="#stay" String=".t." insensitive="true"/>
 
          <AnyChar attribute="Operator" context="#stay" String=":=!" />
          <DetectChar attribute="Keyword" context="#stay" char="@"/>
 
-         <RegExpr String="CLASS[\t ]+" attribute="Keyword" context="ClassContext" insensitive="TRUE" beginRegion="ClassDeclRegion" firstNonSpace="true"/>
+         <RegExpr String="CLASS[\t ]+" attribute="Keyword" context="ClassContext" insensitive="true" beginRegion="ClassDeclRegion" firstNonSpace="true"/>
 
-         <RegExpr String="DO[\t ]+CASE[\t ]*$" attribute="Keyword" context="#stay" insensitive="TRUE" beginRegion="IndentRegion" firstNonSpace="true"/>
+         <RegExpr String="DO[\t ]+CASE[\t ]*$" attribute="Keyword" context="#stay" insensitive="true" beginRegion="IndentRegion" firstNonSpace="true"/>
          <keyword attribute="Keyword" context="#stay" String="context_beginners" beginRegion="IndentRegion" />
          <keyword attribute="Keyword" context="#stay" String="context_terminators" endRegion="IndentRegion" />
-         <RegExpr String="return ?" attribute="Keyword" context="#stay" insensitive="TRUE" endRegion="IndentRegion" column="0"/>
+         <RegExpr String="return ?" attribute="Keyword" context="#stay" insensitive="true" endRegion="IndentRegion" column="0"/>
 
          <keyword attribute="Keyword" context="#stay" String="keywords" />
          <keyword attribute="Keyword" context="#stay" String="set_commands" />
@@ -515,7 +515,7 @@
          <Detect2Chars attribute="Comment" context="comment" char="/" char1="/" />
 
          <keyword attribute="Keyword" context="#stay" String="class_keywords" />
-         <RegExpr String="END(CLASS)? *$" attribute="Keyword" context="#pop" insensitive="TRUE" endRegion="ClassDeclRegion" firstNonSpace="true"/>
+         <RegExpr String="END(CLASS)? *$" attribute="Keyword" context="#pop" insensitive="true" endRegion="ClassDeclRegion" firstNonSpace="true"/>
       </context>
 
    </contexts>
diff --git a/kate/data/xmldebug.xml b/kate/data/xmldebug.xml
index 1f3e09ba4..9c019929c 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.3" name="XML (Debug)" section="Markup" extensions="" mimetype="">
+<language version="1.03" kateversion="2.4" name="XML (Debug)" section="Markup" extensions="" mimetype="">
   <highlighting>
     <list name="AttType">
         <item>CDATA</item>
diff --git a/kate/data/xorg.xml b/kate/data/xorg.xml
index 149643478..7e7ae97c4 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.0" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<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">
 
 <highlighting>
 <contexts>
diff --git a/kate/data/xslt.xml b/kate/data/xslt.xml
index bde62b050..8075ef831 100644
--- a/kate/data/xslt.xml
+++ b/kate/data/xslt.xml
@@ -52,7 +52,7 @@
 
 -->
 
-<language version="1.03" kateversion="2.1" name="xslt" section="Markup" extensions="*.xsl;*.xslt" license="LGPL" author="Peter Lammich (views@gmx.de)">
+<language version="1.03" 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 a93f0c066..cc60c66ff 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.5" 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="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">
 
 <highlighting>
    <list name="keywords">
diff --git a/kate/data/yacas.xml b/kate/data/yacas.xml
index cd8ff3d75..ac058602a 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.3" section="Scientific" extensions="*.ys" mimetype="text/x-yacassrc">
+<language name="yacas" version="1.02" 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 438bfd8fe..41b83d141 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.03-1" kateversion="2.4" section="Sources" extensions="*.y;*.yy" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
+<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">
 
 <highlighting>
 <contexts>
@@ -100,7 +100,7 @@ This code is released under the LGPL as part of tdelibs/kate.
     <DetectChar attribute="Data Type" context="#pop" char="&gt;" />
   </context>
 
-  <context name="Comment" attribute="Comment">
+  <context name="Comment" attribute="Comment" lineEndContext="#stay">
     <Detect2Chars attribute="Comment" context="CommentStar" char="/" char1="*" />
     <!-- not sure that strict yacc allows that ... but I saw it in some sources ... -->
     <Detect2Chars attribute="Comment" context="CommentSlash" char="/" char1="/" />
@@ -112,7 +112,7 @@ This code is released under the LGPL as part of tdelibs/kate.
     <RegExpr attribute="Comment" context="#pop" String="[^\\]$" />
   </context>
 
-  <context name="StringOrChar" attribute="NormalText">
+  <context name="StringOrChar" attribute="NormalText" lineEndContext="#stay">
     <DetectChar attribute="String Char" context="Char" char="'" />
     <DetectChar attribute="String" context="String" char="&quot;" />
   </context>
@@ -131,10 +131,10 @@ This code is released under the LGPL as part of tdelibs/kate.
     <IncludeRules context="##C++" />
     <DetectChar attribute="Directive" context="Dol" char="$" />
   </context>
-  <context name="Dol" attribute="Normal Text" fallthrough="true" fallthroughContext="DolEnd">
+  <context name="Dol" attribute="Normal Text" fallthrough="true" fallthroughContext="DolEnd" lineEndContext="#stay">
     <RegExpr attribute="Data Type" context="DolEnd" String="&lt;[^&gt;]+&gt;" />
   </context>
-  <context name="DolEnd" attribute="Normal Text">
+  <context name="DolEnd" attribute="Normal Text" lineEndContext="#stay">
     <RegExpr attribute="Directive" context="#pop#pop" String="\d+" />
     <DetectChar attribute="Directive" context="#pop#pop" char="$" />
   </context>
diff --git a/kate/data/yaml.xml b/kate/data/yaml.xml
index f67e19699..2f0bd4c8e 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.3" section="Markup"
+<language name="YAML" version="1.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 e2c466448..35c829936 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.1" section="Sources" extensions="*.znn" mimetype="text/x-zonnon">
+<language name="Zonnon" version="1.0" kateversion="2.2" section="Sources" extensions="*.znn" mimetype="text/x-zonnon">
   <highlighting>
     <list name="keywords">
       <item> accept </item>