diff --git a/data/schema/language.xsd b/data/schema/language.xsd
index e8e235e..ee41c75 100644
--- a/data/schema/language.xsd
+++ b/data/schema/language.xsd
@@ -1,719 +1,706 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   	Copyright (c) 2001 Joseph Wenninger <jowenn@kde.org>
   	modified (c) 2002 Anders Lund <anders@alweb.dk>
   	modified (c) 2003 Simon Huerlimann <simon.huerlimann@access.unizh.ch>
   	modified (c) 2005 Dominik Haumann <dhdev@gmx.de>
   	modified (c) 2008 Wilbert Berendsen <info@wilbertberendsen.nl>
 
   	This file describes the XML format used for syntax highlight descriptions
   	for the Kate text editor (http://kate.kde.org), which is part of the KDE
   	desktop environment (http://www.kde.org).
   	You'll find the "Writing a Kate Highlighting XML File HOWTO" at
   	http://kate.kde.org/doc/hlhowto.php
 
   	This format is identified using the SYSTEM identifier
   	SYSTEM "language.dtd"
 
   	Files using this format should include a DOCTYPE declaration like this:
   	<!DOCTYPE language SYSTEM "language.dtd">
 
   	You can validate your syntax files using "validatehl.sh yourSyntax.xml".
   	This needs xmllint from the libxml2 XML library.
 
   	In any case, the katehighlightingindexer will validate all files bundled
   	with KTextEditor during compile time and fail on errors.
 
   	To use your syntax file, copy it to ~/.local/share/katepart5/syntax/ in
   	your home directory. You have to open a new instance of kwrite/kate to use
   	the new syntax file.
 
   TODO
     - find a more readable way for the - -dtdvalid stuff, it's just annoying
       xml comments don't allow it.
 -->
 <!--
   Entity declarations
     You can use '&per;' instead of '.'. This seems to be useful in <item> elements.
 
   TODO
     - Are there any more such pre-defined entities?
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
   <!--
     Default Styles
     Allowed predefined default styles for itemData, available are:
       - dsNormal,   used for normal text
       - dsKeyword,  used for keywords
       - dsFunction, used for function calls
       - dsVariable, used for variables
       - dsControlFlow, used for control flow, e.g. if, then, else, continue, break
       - dsOperator, used for operators such as +, -, *, ::
       - dsBuiltIn,  used for built-in language classes and functions
       - dsExtension,used for extensions, such as boost, Qt
       - dsPreprocessor, used for preprocessor statements
       - dsAttribute,used for attributes, e.g. @override in java
 
       - dsChar,     used for a character
       - dsSpecialChar, used for escaped characters
       - dsString,   used for strings
       - dsVerbatimString, used for strings such as HERE docs
       - dsSpecialString, used for strings such as regular expressions or LaTeX math mode
       - dsImport,   used for includes, imports and modules
 
       - dsDataType, used for data types
       - dsDecVal,   used for decimal values
       - dsBaseN,    used for values with a base other than 10
       - dsFloat,    used for float values
       - dsConstant, used for language constants
 
       - dsComment,  used for comments
       - dsDocumentation, used for comments that are API documentation
       - dsAnnotation, used for annotation in comments, e.g. @param in doxygen
       - dsCommentVar, used for variables in comments, e.g. after @param in doxygen
       - dsRegionMarker, used for region markers
       - dsInformation, used for information in comments, e.g. @note in doxygen
       - dsWarning,  used for warnings in comments, e.g. @warning in doxygen
       - dsAlert,    used for warning messages such as TODO, WARNING in comments
 
       - dsOthers,   used for 'other' things
       - dsError,    used for error highlighting.
   -->
   <xs:simpleType name="defStyles">
     <xs:restriction base="xs:token">
       <xs:enumeration value="dsNormal"/>
       <xs:enumeration value="dsKeyword"/>
       <xs:enumeration value="dsFunction"/>
       <xs:enumeration value="dsVariable"/>
       <xs:enumeration value="dsControlFlow"/>
       <xs:enumeration value="dsOperator"/>
       <xs:enumeration value="dsBuiltIn"/>
       <xs:enumeration value="dsExtension"/>
       <xs:enumeration value="dsPreprocessor"/>
       <xs:enumeration value="dsAttribute"/>
       <xs:enumeration value="dsChar"/>
       <xs:enumeration value="dsSpecialChar"/>
       <xs:enumeration value="dsString"/>
       <xs:enumeration value="dsVerbatimString"/>
       <xs:enumeration value="dsSpecialString"/>
       <xs:enumeration value="dsImport"/>
       <xs:enumeration value="dsDataType"/>
       <xs:enumeration value="dsDecVal"/>
       <xs:enumeration value="dsBaseN"/>
       <xs:enumeration value="dsFloat"/>
       <xs:enumeration value="dsConstant"/>
       <xs:enumeration value="dsComment"/>
       <xs:enumeration value="dsDocumentation"/>
       <xs:enumeration value="dsAnnotation"/>
       <xs:enumeration value="dsCommentVar"/>
       <xs:enumeration value="dsRegionMarker"/>
       <xs:enumeration value="dsInformation"/>
       <xs:enumeration value="dsWarning"/>
       <xs:enumeration value="dsAlert"/>
       <xs:enumeration value="dsOthers"/>
       <xs:enumeration value="dsError"/>
     </xs:restriction>
   </xs:simpleType>
   <!--
     Language specification
       name:        The name of this syntax description. Used in the Highlightning Mode menu
       section:     The logical group to which this syntax description belongs. Used for sub menus
       extensions:  A file glob or pattern to decide for which documents to use this syntax description
       style:       The style that this highlighter provides. It is used through required-syntax-style by the indenters. [optional]
       mimetype:    A list of mimetypes to decide for which documents to use this syntax description [optional]
       version:     Version number of this syntax description [optional]
       kateversion: Kate version required for using this file [optional]
       casesensitive: Whether text is matched case sensitive. [boolean, optional, default=true] FIXME: This is not implemented yet
       priority:    Priority of this language, if more than one are usable for the file [optional]
       author:      Name of author of this hl file [optional]
       license:     License for this hl file [optional]
       indenter:    Name of the Indenter to use for this highlighting mode per default, like "cstyle" [optional]
       hidden:      Should it be hidden in menu [boolean, optional, default=false]
 
     TODO
       - Which matches are affected by casesensitive? keyword, RegExpr, StringDetect, WordDetect...?
 
     WARNING: due to helper scripts, the language opening tag must be on a
     *single line* and *cannot* be split in multiple lines.
 
   -->
   <xs:element name="language">
     <xs:complexType>
       <xs:sequence>
         <xs:element ref="highlighting"/>
         <xs:element minOccurs="0" ref="general"/>
         <xs:element minOccurs="0" ref="spellchecking"/>
       </xs:sequence>
       <xs:attribute name="name" use="required"/>
       <xs:attribute name="section" use="required" type="xs:NMTOKEN"/>
       <xs:attribute name="extensions" use="required"/>
       <xs:attribute name="version" use="required" type="xs:integer"/>
       <xs:attribute name="kateversion" use="required" type="xs:decimal"/>
       <xs:attribute name="style"/>
       <xs:attribute name="mimetype"/>
       <xs:attribute name="casesensitive" type="xs:boolean"/>
       <xs:attribute name="priority" type="xs:integer"/>
       <xs:attribute name="author"/>
       <xs:attribute name="license"/>
       <xs:attribute name="indenter"/>
       <xs:attribute name="hidden" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!-- General options -->
   <xs:element name="general">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="folding"/>
         <xs:element ref="comments"/>
         <xs:element ref="keywords"/>
-        <xs:element ref="indentation"/>
         <xs:element ref="emptyLines"/>
       </xs:choice>
     </xs:complexType>
   </xs:element>
   <!--
     List of folding
     indentationsensitive: If true, the code folding is indentation based.
   -->
   <xs:element name="folding">
     <xs:complexType>
       <xs:attribute name="indentationsensitive" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!-- List of comments -->
   <xs:element name="comments">
     <xs:complexType>
       <xs:sequence>
         <xs:element maxOccurs="unbounded" ref="comment"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <!--
     Comment specification
     name:         Type of this comment. Allowed are 'singleLine' and 'multiLine'
     start:        The comment starts with this string
     end:          The comment ends with this string [optional]
     region:       The region name of the foldable multiline comment. If you have
                   beginRegion="Comment" ... endRegion="Comment" you should use
                   region="Comment". This way uncomment works even if you do not
                   select all the text of the multiline comment.
     position:     only availalbe for type singleLine. Default is column0, to insert
                   the single line comment characters after the whitespaces
                   (= before the first non space) set position to "afterwhitespace"
   -->
   <xs:element name="comment">
     <xs:complexType>
       <xs:attribute name="name" use="required">
         <xs:simpleType>
           <xs:restriction base="xs:token">
             <xs:enumeration value="singleLine"/>
             <xs:enumeration value="multiLine"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
       <xs:attribute name="start" use="required"/>
       <xs:attribute name="end"/>
       <xs:attribute name="region"/>
       <xs:attribute name="position">
         <xs:simpleType>
           <xs:restriction base="xs:token">
             <xs:enumeration value="afterwhitespace"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
     </xs:complexType>
   </xs:element>
   <!--
     Keyword options
     casesensitive:        Whether keywords are matched case sensitive. [boolean, optional, default=true]
     weakDeliminator:      Add weak deliminators [optional, default: ""]
     additionalDeliminator: Add deliminators [optional]
     wordWrapDeliminator:  characters that are used to wrap long lines [optional]
 
   -->
   <xs:element name="keywords">
     <xs:complexType>
       <xs:attribute name="casesensitive" type="xs:boolean"/>
       <xs:attribute name="weakDeliminator"/>
       <xs:attribute name="additionalDeliminator"/>
       <xs:attribute name="wordWrapDeliminator"/>
     </xs:complexType>
   </xs:element>
-  <!--
-    Indentation options
-      mode:        indentation mode to use
-
-    TODO
-      - Explain (weak) deliminators
-  -->
-  <xs:element name="indentation">
-    <xs:complexType>
-      <xs:attribute name="mode"/>
-    </xs:complexType>
-  </xs:element>
   <!--
     Treat lines that match a given regular expression as empty line. This is
     needed for example in Python for comments (#...), as then the indentation
     based folding should ignore the line.
     This is only implemented for indentation based folding. If the folding
     is not indentation based, the emptyLines are not used.
   -->
   <xs:element name="emptyLines">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="emptyLine"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <!--
     One empty line regular expression.
     regexpr:       The regular expression, example from python: ^\s*#.*$
     casesensitive: Sets, whether the regular expression match is performed case sesitive
   -->
   <xs:element name="emptyLine">
     <xs:complexType>
       <xs:attribute name="regexpr" use="required"/>
       <xs:attribute name="casesensitive" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!-- Highlighting specification -->
   <xs:element name="highlighting">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="list"/>
         <xs:element ref="contexts"/>
         <xs:element ref="itemDatas"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <!--
     List of items
     name:     Name of this list
   -->
   <xs:element name="list">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" maxOccurs="unbounded" ref="item"/>
       </xs:sequence>
       <xs:attribute name="name" use="required"/>
     </xs:complexType>
   </xs:element>
   <!--
     List item
     contains string used in <keyword>
   -->
   <xs:element name="item" type="xs:string"/>
   <!-- List of contexts -->
   <xs:element name="contexts">
     <xs:complexType>
       <xs:sequence>
         <xs:element maxOccurs="unbounded" ref="context"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <!--
     context specification
       name:             The name of this context specification. Used in '*Context' attributes [optional]
       attribute:        The name of the ItemData to be used for matching text
       lineEndContext:   Next context if end of line is encountered
       lineEmptyContext: Next context if an empty line is encountered [optional]
       fallthrough:      Use a fallthrough context [optional]
       fallthroughContext: Fall through to this context [optional]
       dynamic:          Dynamic context [boolean, optional]
       noIndentationBasedFolding: Python uses indentation based folding. However, Python has parts where
     		    it does not use indentation based folding (e.g. for """ strings). In this case
     		    switch to an own context and set this attribute to true. Then the indentation
     		    based folding will ignore this parts and not change folding markers. [optional]
 
     TODO:
       - Explain fallthrough.
       - Do we need fallthrough at all? It could be true, if fallthroughContext is set, false otherwise.
       - Make lineEndContext optional, defaults to '#stay'. Reasonable?
   -->
   <xs:element name="context">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="keyword"/>
         <xs:element ref="Float"/>
         <xs:element ref="HlCOct"/>
         <xs:element ref="HlCHex"/>
         <xs:element ref="HlCFloat"/>
         <xs:element ref="Int"/>
         <xs:element ref="DetectChar"/>
         <xs:element ref="Detect2Chars"/>
         <xs:element ref="AnyChar"/>
         <xs:element ref="StringDetect"/>
         <xs:element ref="WordDetect"/>
         <xs:element ref="RegExpr"/>
         <xs:element ref="LineContinue"/>
         <xs:element ref="HlCStringChar"/>
         <xs:element ref="RangeDetect"/>
         <xs:element ref="HlCChar"/>
         <xs:element ref="IncludeRules"/>
         <xs:element ref="DetectSpaces"/>
         <xs:element ref="DetectIdentifier"/>
       </xs:choice>
       <xs:attribute name="name"/>
       <xs:attribute name="attribute" use="required"/>
       <xs:attribute name="lineEndContext" use="required"/>
       <xs:attribute name="lineEmptyContext"/>
       <xs:attribute name="fallthrough" type="xs:boolean"/>
       <xs:attribute name="fallthroughContext"/>
       <xs:attribute name="dynamic" type="xs:boolean"/>
       <xs:attribute name="noIndentationBasedFolding" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!--
     Common attributes
     attribute:    The name of the ItemData to be used for matching text
     context:      The name of the context to go to when this rule matches
     beginRegion:  Begin a region of type beginRegion [optional]
     endRegion:    End a region of type endRegion [optional]
     firstNonSpace: should this rule only match at first non-space char in line?
     column: should this rule only match at given column in line (column == count of chars in front)
   -->
   <xs:attributeGroup name="commonAttributes">
     <xs:attribute name="attribute"/>
     <xs:attribute name="context"/>
     <xs:attribute name="beginRegion"/>
     <xs:attribute name="endRegion"/>
     <xs:attribute name="lookAhead" type="xs:boolean"/>
     <xs:attribute name="firstNonSpace" type="xs:boolean"/>
     <xs:attribute name="column" type="xs:integer"/>
   </xs:attributeGroup>
   <!--
     Detect members of a keyword list
       commonAttributes: Common attributes
       insensitive:      Is this list case-insensitive? [boolean, optional, see note]
       String:           Name of the list
       weakDelimiter:    Use weak deliminator
 
       By default, case sensitivity is determined from <keywords casesensitive> in
       <general> (default=true), but can be overridden per-list with 'insensitive'.
 
     TODO:
       - Should be weakDeliminator
       - Explain deliminator
       - Doesn't seem to be supported in highligh.cpp
   -->
   <xs:element name="keyword">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
       <xs:attribute name="insensitive" type="xs:boolean"/>
       <xs:attribute name="String" use="required"/>
       <xs:attribute name="weakDelimiter"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect a floating point number
     commonAttributes: Common attributes
     AnyChar is allowed as a child rule. TODO: The source code allows
     *all* rules to be child rules, shall we change the DTD in some way?
   -->
   <xs:element name="Float">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="AnyChar"/>
         <xs:element ref="StringDetect"/>
       </xs:choice>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect an octal number
     commonAttributes: Common attributes
   -->
   <xs:element name="HlCOct">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect a hexadecimal number
     commonAttributes: Common attributes
   -->
   <xs:element name="HlCHex">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect a C-style floating point number
     commonAttributes: Common attributes
   -->
   <xs:element name="HlCFloat">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect C-style character
       commonAttributes: Common attributes
 
     TODO
       - Did I get this right?
   -->
   <xs:element name="HlCChar">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect an integer number
     commonAttributes: Common attributes
     StringDetect is allowed as a child rule. TODO: The source code allows
     *all* rules to be child rules, shall we change the DTD in some way?
   -->
   <xs:element name="Int">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="AnyChar"/>
         <xs:element ref="StringDetect"/>
       </xs:choice>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect a single character
     commonAttributes: Common attributes
     char:             The character to look for
     dynamic:          Uses 0 ... 9 as placeholders for dynamic arguments (in fact, first char of arg...) [boolean, optional, default=false]
   -->
   <xs:element name="DetectChar">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
       <xs:attribute name="char" use="required"/>
       <xs:attribute name="dynamic" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect two characters
     commonAttributes: Common attributes
     char:             The first character
     char1:            The second character
     dynamic:          Uses 0 ... 9 as placeholders for dynamic arguments (in fact, first char of arg...) [boolean, optional, default=false]
   -->
   <xs:element name="Detect2Chars">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
       <xs:attribute name="char" use="required"/>
       <xs:attribute name="char1" use="required"/>
       <xs:attribute name="dynamic" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect any group of characters
       commonAttributes: Common attributes
       String:           A string representing the characters to look for
 
     TODO
       - Description is not descriptive enough, I'm not sure what it exactly does:-(
   -->
   <xs:element name="AnyChar">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
       <xs:attribute name="String" use="required"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect a string
       commonAttributes: Common attributes
       String:           The string to look for
       insensitive:      Whether the string is matched case INsensitive. [boolean, optional, default=false]
       dynamic:          Uses %0 ... %9 as placeholders for dynamic arguments [boolean, optional, default=false]
 
     TODO
       - What's default of insensitive? I'm not sure...
   -->
   <xs:element name="StringDetect">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
       <xs:attribute name="String" use="required"/>
       <xs:attribute name="insensitive" type="xs:boolean"/>
       <xs:attribute name="dynamic" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect a word, i.e. a string at word boundaries
       commonAttributes: Common attributes
       String:           The string to look for
       insensitive:      Whether the string is matched case INsensitive. [boolean, optional, default=false]
       dynamic:          Uses %0 ... %9 as placeholders for dynamic arguments [boolean, optional, default=false]
 
     TODO
       - What's default of insensitive? I'm not sure...
   -->
   <xs:element name="WordDetect">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
       <xs:attribute name="String" use="required"/>
       <xs:attribute name="insensitive" type="xs:boolean"/>
       <xs:attribute name="dynamic" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect a match of a regular expression
     commonAttributes: Common attributes
     String:           The regular expression pattern
     insensitive:      Whether the text is matched case INsensitive. [boolean, optional, default=false]
     minimal:          Wheather to use minimal matching for wild cards in the pattern [boolean, optional, default='false']
     dynamic:          Uses %0 ... %9 as placeholders for dynamic arguments [boolean, optional, default=false]
   -->
   <xs:element name="RegExpr">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
       <xs:attribute name="String" use="required"/>
       <xs:attribute name="insensitive" type="xs:boolean"/>
       <xs:attribute name="minimal" type="xs:boolean"/>
       <xs:attribute name="dynamic" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect a line continuation
     commonAttributes: Common attributes
     char:             The char marking the end of line [char,  optional,  default='\\']
   -->
   <xs:element name="LineContinue">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
       <xs:attribute name="char"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect a C-style escaped character
       commonAttributes: Common attributes
 
     TODO:
       - Did I get this right? Only one character, or a string?
   -->
   <xs:element name="HlCStringChar">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
   <!--
     Detect a range of characters
     commonAttributes: Common attributes
     char:             The character starting the range
     char1:            The character terminating the range
   -->
   <xs:element name="RangeDetect">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
       <xs:attribute name="char" use="required"/>
       <xs:attribute name="char1" use="required"/>
     </xs:complexType>
   </xs:element>
   <!--
     Include Rules of another context
     context:             The name of the context to include
     includeAttrib:       If this is true, the host context of the IncludeRules
                          will be given the attribute of the source context
   -->
   <xs:element name="IncludeRules">
     <xs:complexType>
       <xs:attribute name="context" use="required"/>
       <xs:attribute name="includeAttrib" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!-- Detect all following Spaces -->
   <xs:element name="DetectSpaces">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
   <!-- Detect an Identifier ( == LETTER(LETTER|NUMBER|_)*) -->
   <xs:element name="DetectIdentifier">
     <xs:complexType>
       <xs:attributeGroup ref="commonAttributes"/>
     </xs:complexType>
   </xs:element>
   <!-- List of attributes -->
   <xs:element name="itemDatas">
     <xs:complexType>
       <xs:sequence>
         <xs:element maxOccurs="unbounded" ref="itemData"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <!--
     Attribute specification
     name          CDATA   #REQUIRED       The name of this attribute
     defStyleNum   CDATA   #REQUIRED       The index of the default style to use
     color         CDATA   #IMPLIED        Color for this style, either a hex triplet, a name or some other format recognized by Qt [optional]
     selColor      CDATA   #IMPLIED        The color for this style when text is selected [optional]
     italic        CDATA   #IMPLIED        Whether this attribute should be rendered using an italic typeface [optional, boolean, default=false]
     bold          CDATA   #IMPLIED        Whether this attribute should be renederd using a bold typeface [optional, boolean, default=false]
     underline     CDATA   #IMPLIED        Whether this attribute should be underlined [optional, boolean, default=false]
     strikeOut     CDATA   #IMPLIED        Whether this attribute should be striked out [optional, boolean, default=false]
     backgroundColor    CDATA #IMPLIED     The background color for this style [optional]
     selBackgroundColor CDATA #IMPLIED     The background color for this style when text is selected [optional]
     spellChecking      CDATA #IMPLIED     Whether this attribute should be spell checked [optional, boolean, default=true]
   -->
   <xs:element name="itemData">
     <xs:complexType>
       <xs:attribute name="name" use="required"/>
       <xs:attribute name="defStyleNum" use="required" type="defStyles"/>
       <xs:attribute name="color"/>
       <xs:attribute name="selColor"/>
       <xs:attribute name="italic" type="xs:boolean"/>
       <xs:attribute name="bold" type="xs:boolean"/>
       <xs:attribute name="underline" type="xs:boolean"/>
       <xs:attribute name="strikeOut" type="xs:boolean"/>
       <xs:attribute name="backgroundColor"/>
       <xs:attribute name="selBackgroundColor"/>
       <xs:attribute name="spellChecking" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!--
     encodingPolicy type
     Attributes that are of type 'encodingPolicy' allow the following values:
     'EncodeAlways', 'EncodeWhenPresent' and 'EncodeNever'
   -->
   <xs:simpleType name="encodingPolicy">
     <xs:restriction base="xs:token">
       <xs:enumeration value="EncodeAlways"/>
       <xs:enumeration value="EncodeWhenPresent"/>
       <xs:enumeration value="EncodeNever"/>
     </xs:restriction>
   </xs:simpleType>
   <!-- Spellchecking specification -->
   <xs:element name="spellchecking">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" ref="configuration"/>
         <xs:element minOccurs="0" ref="encodings"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <!-- List of character encodings -->
   <xs:element name="encodings">
     <xs:complexType>
       <xs:sequence>
         <xs:element maxOccurs="unbounded" ref="encoding"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
   <!--
     Encoding specification
     sequence       CDATA        #REQUIRED  Character sequence of the encoding; must not contain new-line characters, i.e. \n or \r
     character      CDATA        #IMPLIED   Encoded character; must be of length 1
     ignored        (%boolean;)  #IMPLIED   If true, then the encoding sequence is ignored for spellchecking
   -->
   <xs:element name="encoding">
     <xs:complexType>
       <xs:attribute name="string" use="required"/>
       <xs:attribute name="char"/>
       <xs:attribute name="ignored" type="xs:boolean"/>
     </xs:complexType>
   </xs:element>
   <!--
     Spellchecking configuration
     encodingReplacementPolicy       (%encodingPolicy;)     #IMPLIED  Policy for replacing encoded characters in replacements for misspelled words
   -->
   <xs:element name="configuration">
     <xs:complexType>
       <xs:attribute name="encodingReplacementPolicy" type="encodingPolicy"/>
     </xs:complexType>
   </xs:element>
 </xs:schema>
diff --git a/data/syntax/4dos.xml b/data/syntax/4dos.xml
index 7883706..b5f72ec 100644
--- a/data/syntax/4dos.xml
+++ b/data/syntax/4dos.xml
@@ -1,925 +1,924 @@
 <?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="5.0" version="4" section="Scripts" extensions="*.btm" casesensitive="0" author="Stefan Huebner (st0ff@npl.de)" license="LGPL">
+<language name="4DOS BatchToMemory" kateversion="5.0" version="5" section="Scripts" extensions="*.btm" casesensitive="0" indenter="cstyle" 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</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="dsSpecialChar"/>
 			<itemData name="Variable"	defStyleNum="dsVariable"/>
 			<itemData name="VariableBold" defStyleNum="dsVariable" bold="true"/>
 			<itemData name="Alert"	  defStyleNum="dsAlert"/>
 			<itemData name="Error"	  defStyleNum="dsError"/>
 			<itemData name="Operator"	defStyleNum="dsOperator"/>
 		</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/data/syntax/coffee.xml b/data/syntax/coffee.xml
index 2b54b88..25b4f97 100644
--- a/data/syntax/coffee.xml
+++ b/data/syntax/coffee.xml
@@ -1,341 +1,340 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 
 <language name="CoffeeScript"
-          version="6"
+          version="7"
           kateversion="3.4"
           section="Scripts"
           extensions="Cakefile;*.coffee;*.coco;*.cson"
           mimetype="text/x-coffeescript;application/x-coffeescript;application/vnd.coffeescript"
           indenter="python"
           casesensitive="1"
           author="Max Shawabkeh (max99x@gmail.com)"
           license="MIT">
   <highlighting>
     <!-- Built-in constants. -->
     <list name="value_keywords">
       <item>false</item>
       <item>true</item>
       <item>yes</item>
       <item>no</item>
       <item>on</item>
       <item>off</item>
       <item>undefined</item>
       <item>null</item>
       <item>NaN</item>
       <item>Infinity</item>
     </list>
     <!-- Generic keywords. -->
     <list name="keywords">
       <item>return</item>
       <item>break</item>
       <item>continue</item>
       <item>throw</item>
       <item>for</item>
       <item>while</item>
       <item>until</item>
       <item>loop</item>
       <item>if</item>
       <item>else</item>
       <item>unless</item>
       <item>switch</item>
       <item>when</item>
       <item>then</item>
       <item>and</item>
       <item>or</item>
       <item>in</item>
       <item>do</item>
       <item>of</item>
       <item>by</item>
       <item>is</item>
       <item>isnt</item>
       <item>not</item>
       <item>typeof</item>
       <item>delete</item>
       <item>where</item>
       <item>super</item>
       <item>try</item>
       <item>catch</item>
       <item>finally</item>
       <item>try</item>
       <item>catch</item>
       <item>finally</item>
       <item>constructor</item>
     </list>
     <!-- Keywords which are always followed by a class name. -->
     <list name="class_keywords">
       <item>class</item>
       <item>extends</item>
       <item>new</item>
       <item>instanceof</item>
     </list>
     <!-- Reserved words. -->
     <list name="reserved">
       <item>case</item>
       <item>default</item>
       <item>function</item>
       <item>var</item>
       <item>void</item>
       <item>with</item>
       <item>const</item>
       <item>let</item>
       <item>enum</item>
       <item>export</item>
       <item>import</item>
       <item>native</item>
       <item>__hasProp</item>
       <item>__extends</item>
       <item>__slice</item>
       <item>__bind</item>
       <item>__indexOf</item>
     </list>
     <!-- Built-in globals provided in most contexts. -->
     <list name="globals">
       <item>Object</item>
       <item>Number</item>
       <item>Boolean</item>
       <item>Array</item>
       <item>String</item>
       <item>RegExp</item>
       <item>Function</item>
       <item>Date</item>
       <item>Math</item>
       <item>eval</item>
       <item>setInterval</item>
       <item>clearInterval</item>
       <item>setTimeout</item>
       <item>clearTimeout</item>
       <item>isFinite</item>
       <item>isNaN</item>
       <item>parseFloat</item>
       <item>parseInt</item>
       <item>escape</item>
       <item>unescape</item>
       <item>console</item>
       <item>encodeURI</item>
       <item>encodeURIComponent</item>
       <item>decodeURI</item>
       <item>decodeURIComponent</item>
     </list>
     <!-- Built-in globals provided in browser context. -->
     <list name="browser_globals">
       <item>window</item>
       <item>document</item>
       <item>navigator</item>
       <item>location</item>
       <item>history</item>
       <item>screen</item>
       <item>alert</item>
       <item>prompt</item>
     </list>
     <!-- Built-in globals provided in Node.js context. -->
     <list name="nodejs_globals">
       <item>process</item>
       <item>GLOBAL</item>
       <item>require</item>
       <item>exports</item>
     </list>
     <!-- Context-sensitive highlighting rules. -->
     <contexts>
       <!-- Generic code. -->
       <context name="Normal" attribute="Normal" lineEndContext="#stay">
         <DetectSpaces/>
         <!-- Numbers. -->
         <Float attribute="Float" context="#stay"/>
         <Int attribute="Decimal" context="#stay"/>
         <HlCOct attribute="Oct" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
         <!-- Keywords. -->
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Keyword" context="Class" String="class_keywords"/>
         <keyword attribute="Value Keywords" context="#stay" String="value_keywords"/>
         <keyword attribute="Reserved" context="#stay" String="reserved"/>
         <!-- Globals. -->
         <keyword attribute="Globals" context="#stay" String="globals"/>
         <keyword attribute="Browser Globals" context="#stay" String="browser_globals"/>
         <keyword attribute="Node.js Globals" context="#stay" String="nodejs_globals"/>
         <!-- Member accessors. -->
         <RegExpr attribute="Accessor" context="#stay" String="(@[_$a-zA-Z][$\w]*|\bthis)\b" insensitive="false"/>
         <!-- Function definitions. Matches an optional argument list followed by a function arrow (normal or fat). -->
         <RegExpr attribute="Function" context="#stay" String="(\((\'[^']*'|&quot;[^&quot;]*&quot;|[^()])*\))?\s*(-|=)&gt;" insensitive="true"/>
         <!-- Generic identifiers. -->
         <RegExpr attribute="Identifier" context="#stay" String="[_$a-z][$\w]*\b" insensitive="true"/>
         <!-- Strings. -->
         <StringDetect attribute="String" context="Heredoc" String="'''" beginRegion="Heredoc"/>
         <StringDetect attribute="String" context="Rich Heredoc" String="&quot;&quot;&quot;" beginRegion="Rich Heredoc"/>
         <DetectChar attribute="String" context="String" char="'"/>
         <DetectChar attribute="String" context="Rich String" char="&quot;"/>
         <!-- Embedded JavaScript. -->
         <StringDetect attribute="Javascript" context="Javascript Triple Backticks" String="```" beginRegion="Javascript TB"/>
         <DetectChar attribute="Javascript" context="Javascript" char="`" beginRegion="Javascript"/>
         <!-- Comments. -->
         <StringDetect attribute="Comment" context="Multiline Comment" String="###" beginRegion="Comment"/>
         <DetectChar attribute="Comment" context="Comment" char="#"/>
         <!-- Regular expressions. -->
         <StringDetect attribute="Regex" context="Multiline Regex" String="///" beginRegion="Multiline Regex"/>
         <RegExpr attribute="Regex" context="#stay" String="/([^/\\\r\n]|\\.)*/[mig]{0,3}"/>
         <!-- Member objects. -->
         <DetectChar attribute="Symbol" context="Member Object" char="."/>
         <!-- Operators and other non-alphanumeric symbols. -->
         <AnyChar attribute="Symbol" context="#stay" String="():!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;{}"/>
       </context>
       <!-- Multiline regular expressions. -->
       <context name="Multiline Regex" attribute="Regex" lineEndContext="#stay" noIndentationBasedFolding="1">
         <HlCStringChar attribute="Regex" context="#stay"/>
         <DetectChar attribute="Comment" context="Comment" char="#"/>
         <RegExpr attribute="Regex" context="#pop" String="///[mig]{0,3}" endRegion="Multiline Regex"/>
       </context>
       <!-- Class names. -->
       <context name="Class" attribute="Normal" lineEndContext="#stay">
         <DetectSpaces/>
         <RegExpr attribute="Class" context="#pop" String="[@$:.\w\[\]]+"/>
       </context>
       <!-- Member objects. -->
       <context name="Member Object" attribute="Normal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
         <RegExpr attribute="Identifier" context="#pop" String="\s*[_$a-z][$\w]*" insensitive="true"/>
       </context>
       <!-- Comments. -->
       <context name="Comment" attribute="Comment" lineEndContext="#pop">
         <IncludeRules context="##Alerts_indent"/>
       </context>
       <context name="Multiline Comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="1">
         <StringDetect attribute="Comment" context="#pop" String="###" endRegion="Comment"/>
         <IncludeRules context="##Alerts_indent"/>
       </context>
       <!-- Single-line strings. -->
       <context name="String" attribute="String" lineEndContext="#stay">
         <IncludeRules context="Escape"/>
         <DetectChar attribute="String" context="#pop" char="'"/>
       </context>
       <context name="Rich String" attribute="String" lineEndContext="#stay">
         <IncludeRules context="Escape"/>
         <Detect2Chars attribute="Embedding" context="Embedding" char="#" char1="{"/>
         <DetectChar attribute="String" context="#pop" char="&quot;"/>
       </context>
       <!-- Multi-line strings. -->
       <context name="Heredoc" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="1">
         <IncludeRules context="Escape"/>
         <StringDetect attribute="String" context="#pop" String="'''" endRegion="Heredoc"/>
       </context>
       <context name="Rich Heredoc" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="1">
         <IncludeRules context="Escape"/>
         <Detect2Chars attribute="Embedding" context="Embedding" char="#" char1="{"/>
         <StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;" endRegion="Rich Heredoc"/>
       </context>
       <!-- Escaped characters. -->
       <context name="Escape" attribute="String" lineEndContext="#stay">
         <!-- Hexadecimal, unicode & reserved character escape sequences. -->
         <RegExpr attribute="Escape" context="#stay" String="\\(x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|u\{[0-9a-fA-F]+\}|[\\0bfnrtv&quot;&apos;])"/>
         <!-- Invalid escapes. Octal escape sequences are not allowed. -->
         <RegExpr attribute="Error" context="#stay" String="\\[ux1-7]"/>
         <!-- Make any character literal. -->
         <RegExpr attribute="Literal Character Escape" context="#stay" String="\\."/>
         <LineContinue attribute="Escape" context="#stay"/>
       </context>
       <!-- Expressions embedded in strings. -->
       <context name="Embedding" attribute="Normal" lineEndContext="#stay">
         <DetectChar attribute="Embedding" context="#pop" char="}"/>
       </context>
 
       <!-- Embedded Javascript (one backtick). -->
       <context name="Javascript" attribute="Normal" lineEndContext="#stay" noIndentationBasedFolding="1">
         <DetectChar attribute="Javascript" context="#pop" char="`" endRegion="Javascript"/>
         <!-- NOTE: This hides errors where a backtick is embedded in a JS string or a comment. -->
         <IncludeRules context="Overwrite Javascript"/>
         <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
       </context>
       <!-- Allow template strings in JavaScript embedded code (with one backtick). -->
       <context name="Overwrite Javascript" attribute="Javascript" lineEndContext="#stay" noIndentationBasedFolding="1">
         <!-- JavaScript Template. -->
         <Detect2Chars attribute="JavaScript Template" context="Javascript Template" char="\" char1="`"/>
         <RegExpr attribute="Error" context="#stay" String="String\.raw(?=`)"/>
         <StringDetect attribute="JavaScript Template" context="Javascript RawTemplate" String="String.raw\`"/>
         <!-- Contexts of javascript.xml. -->
         <DetectChar attribute="JavaScript Symbol" context="JavaScript Object" char="{" beginRegion="Brace" />
       </context>
       <context name="JavaScript Object" attribute="Normal" lineEndContext="#stay" noIndentationBasedFolding="1">
         <DetectChar context="#pop" char="`" lookAhead="true"/>
         <DetectChar attribute="JavaScript Symbol" context="#pop" char="}" endRegion="Brace"/>
         <IncludeRules context="Overwrite Javascript"/>
         <IncludeRules context="Object##JavaScript"/>
       </context>
       <context name="Javascript Template" attribute="JavaScript Template" lineEndContext="#stay" noIndentationBasedFolding="1">
         <RegExpr attribute="Escape" context="#stay" String="\\\\\\`"/>
         <Detect2Chars attribute="JavaScript Template" context="#pop" char="\" char1="`"/> <!-- End template. -->
         <DetectChar context="#pop" char="`" lookAhead="true"/>
         <Detect2Chars attribute="JavaScript Substitution" context="Javascript Substitution" char="$" char1="{"/>
         <IncludeRules context="Template##JavaScript"/>
         <RegExpr attribute="Error" context="#stay" String="([^\\\s](?=`)|\S(?=\s+`))"/>
       </context>
       <context name="Javascript RawTemplate" attribute="JavaScript Template" lineEndContext="#stay">
         <Detect2Chars attribute="JavaScript Template" context="#stay" char="\" char1="\"/>
         <Detect2Chars attribute="JavaScript Template" context="#pop" char="\" char1="`"/>
         <DetectChar context="#pop" char="`" lookAhead="true"/>
         <RegExpr attribute="Error" context="#stay" String="([^\\\s](?=`)|\S(?=\s+`))"/>
       </context>
       <context name="Javascript Substitution" attribute="Normal" lineEndContext="#stay" noIndentationBasedFolding="1">
         <DetectChar attribute="Javascript" context="#pop" char="`" lookAhead="true"/>
         <DetectChar context="#pop" attribute="JavaScript Substitution" char="}"/>
         <IncludeRules context="Overwrite Javascript"/>
         <IncludeRules context="Substitution##JavaScript"/>
       </context>
       <!-- Embedded Javascript (triple backticks). -->
       <context name="Javascript Triple Backticks" attribute="Normal" lineEndContext="#stay" noIndentationBasedFolding="1">
         <StringDetect attribute="Javascript" context="#pop" String="```" endRegion="Javascript TB"/>
         <DetectChar attribute="JavaScript Symbol" context="JavaScript-TB Object" char="{" beginRegion="Brace"/>
         <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
       </context>
       <context name="JavaScript-TB Object" attribute="Normal" lineEndContext="#stay" noIndentationBasedFolding="1">
         <StringDetect attribute="Javascript" context="#pop" String="```" lookAhead="true"/>
         <DetectChar attribute="JavaScript Symbol" context="#pop" char="}" endRegion="Brace"/>
         <DetectChar attribute="JavaScript Symbol" context="JavaScript-TB Object" char="{" beginRegion="Brace"/>
         <IncludeRules context="Object##JavaScript"/>
       </context>
     </contexts>
     <!-- Style mappings. -->
     <itemDatas>
       <itemData name="Normal" defStyleNum="dsNormal" spellChecking="false"/>
       <itemData name="Identifier" defStyleNum="dsNormal" spellChecking="false"/>
       <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
       <itemData name="Function" defStyleNum="dsFunction" spellChecking="false"/>
       <itemData name="Decimal" defStyleNum="dsDecVal" spellChecking="false"/>
       <itemData name="Float" defStyleNum="dsFloat" spellChecking="false"/>
       <itemData name="Oct" defStyleNum="dsBaseN" spellChecking="false"/>
       <itemData name="Hex" defStyleNum="dsBaseN" spellChecking="false"/>
       <itemData name="String" defStyleNum="dsString" spellChecking="false"/>
       <itemData name="Comment" defStyleNum="dsComment" spellChecking="true"/>
       <itemData name="Symbol" defStyleNum="dsKeyword" spellChecking="false"/>
       <itemData name="Embedding" defStyleNum="dsChar" spellChecking="false"/>
       <itemData name="Accessor" defStyleNum="dsDataType" spellChecking="false"/>
       <itemData name="Class" defStyleNum="dsDataType" spellChecking="false" bold="1"/>
       <itemData name="Javascript" defStyleNum="dsAlert" spellChecking="false" italic="1"/>
       <itemData name="Regex" defStyleNum="dsString" spellChecking="false"/>
       <itemData name="Reserved" defStyleNum="dsAlert" spellChecking="false"/>
       <itemData name="Value Keywords" defStyleNum="dsOthers" spellChecking="false"/>
       <itemData name="Globals" defStyleNum="dsOthers" spellChecking="false"/>
       <!-- Context-sensitive globals - not styled by default. -->
       <itemData name="Browser Globals" defStyleNum="dsNormal" spellChecking="false"/>
       <itemData name="Node.js Globals" defStyleNum="dsNormal" spellChecking="false"/>
       <itemData name="Escape" defStyleNum="dsSpecialChar" spellChecking="false" />
       <itemData name="Literal Character Escape" defStyleNum="dsChar" spellChecking="false" />
       <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
 
       <itemData name="JavaScript Symbol" defStyleNum="dsOperator" spellChecking="false"/>
       <itemData name="JavaScript Template" defStyleNum="dsVerbatimString"/>
       <itemData name="JavaScript Substitution" defStyleNum="dsSpecialChar" spellChecking="false"/>
     </itemDatas>
   </highlighting>
   <!-- Global settings. -->
   <general>
-    <indentation mode="python"/>
     <folding indentationsensitive="1"/>
     <comments>
       <comment name="singleLine" start="#"/>
       <comment name="multiLine" start="###" end="###" region="Comment"/>
     </comments>
     <keywords casesensitive="1" additionalDeliminator="#'`"/>
     <emptyLines>
       <emptyLine regexpr="(?:\s+|\s*#.*)"/>
     </emptyLines>
   </general>
 </language>
diff --git a/data/syntax/jira.xml b/data/syntax/jira.xml
index 5dc9e09..8274223 100644
--- a/data/syntax/jira.xml
+++ b/data/syntax/jira.xml
@@ -1,719 +1,718 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE language SYSTEM "language.dtd" [
 
   <!ENTITY citation "(\s|^)\?\?[^\s]{1}[^?]+\?\?(?=\s|\.|,|;|:|\-|$)">
   <!ENTITY deleted "(\s|^)\-[^\s]{1}[^\-]+\-(?=\s|\.|,|;|:|\?|$)">
   <!ENTITY emphasis "(\s|^)_[^\s]{1}[^_]+_(?=\s|\.|,|;|:|\-|\?|$)">
   <!ENTITY inserted "(\s|^)\+[^\s]{1}[^\+]+\+(?=\s|\.|,|;|:|\-|\?|$)">
   <!ENTITY monospaced "(\s|^)\{\{[^\s]{1}[^}]+\}\}(?=\s|\.|,|;|:|\-|$)">
   <!ENTITY strong "(\s|^)\*[^\s]{1}[^\*]+\*(?=\s|\.|,|;|:|\-|\?|$)">
   <!ENTITY subscript "(\s|^)~[^\s]{1}[^~]+~(?=\s|\.|,|;|:|\-|\?|$)">
   <!ENTITY superscript "(\s|^)\^[^\s]{1}[^\^]+\^(?=\s|\.|,|;|:|\-|\?|$)">
 
   <!ENTITY attachment                       "(\s|^)\[\^[^]\s]{1}[^]]+\]">
   <!ENTITY bracketAnchor                    "(\s|^)\[#[^]\s]{1}[^]]+\]">
   <!ENTITY taggedLink                       "(\s|^)\[[^]\s|]{1}[^]|]+\]">
   <!ENTITY taggedLinkWithDisplayText        "(\s|^)\[[^]\s|]{1}[^]|]+\|[^]\s|]{1}[^]|]+\]">
   <!ENTITY userTag                          "(\s|^)\[~[^]\s]{1}[^]]+\]">
 
   <!ENTITY embeddedItem                     "(\s|^)![^!\s]{1}[^!]+!">
   <!ENTITY embeddedItemAttributeAndValue    "(\s|^)\w+=\w+">
 
   <!ENTITY panel                    "(\s|^)\{panel[^\}]*\}">
   <!ENTITY panelAttributeAndValue   "(\s|^)\w+=[^\}\|]+">
 
   <!ENTITY code                     "(\s|^)\{code[^\}]*\}">
   <!ENTITY codeAttribute            "(\s|^)[^\}\|]+">
   <!ENTITY codeAttributeAndValue    "(\s|^)\w+=[^\}\|]+">
 
   <!ENTITY url "(http:|https:|ftp:|mailto:)[^]|) ]*(?=$|[]|\s|\)])">
 ]>
-<language name="Jira" section="Markup" version="5" kateversion="3.0" extensions="*.jira" mimetype="" license="FDL" >
+<language name="Jira" section="Markup" version="6" kateversion="3.0" extensions="*.jira" mimetype="" license="FDL" >
   <highlighting>
 
     <!--
     Documentation about the Jira syntax: https://jira.atlassian.com/secure/WikiRendererHelpAction.jspa?section=all
     -->
 
     <contexts>
 
       <!-- Main Context -->
       <context name="Start" attribute="Normal" lineEndContext="#stay" >
         <IncludeRules context="FindIcons" />
         <IncludeRules context="FindTables" />
         <IncludeRules context="FindBlockQuote" />
         <IncludeRules context="FindColor" />
         <IncludeRules context="FindHeader" />
         <IncludeRules context="FindQuote" />
         <IncludeRules context="FindNoFormat" />
         <IncludeRules context="FindPanels" />
         <IncludeRules context="FindCode" />
         <IncludeRules context="FindTextBreaks" />
         <IncludeRules context="FindEmbeddedItems" />
         <IncludeRules context="FindLinks" />
         <IncludeRules context="FindListItem" />
         <IncludeRules context="FindTextEffects" />
         <IncludeRules context="FindEscapeSequences" />
         <IncludeRules context="FindLineBreaks" />
       </context>
 
 
       <!-- Contexts -->
 
       <!-- Headings -->
       <context name="Header" attribute="Header" lineEndContext="#pop" />
 
       <!-- Links -->
       <context name="BracketAnchor" lineEndContext="#stay" attribute="Normal">
         <Detect2Chars char="[" char1="#" attribute="Special Character" context="BracketAnchorContent" />
       </context>
       <context name="BracketAnchorContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char="]" attribute="Special Character" context="#pop#pop" />
       </context>
 
       <context name="AttachmentLink" lineEndContext="#stay" attribute="Normal">
         <Detect2Chars char="[" char1="^" attribute="Special Character" context="AttachmentLinkContent" />
       </context>
       <context name="AttachmentLinkContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char="]" attribute="Special Character" context="#pop#pop" />
       </context>
 
       <context name="EmbeddedItem" lineEndContext="#stay" attribute="Normal">
         <DetectChar char="!" attribute="Special Character" context="EmbeddedItemContent" />
       </context>
       <context name="EmbeddedItemContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="#stay" />
         <DetectChar char="^" attribute="Special Character" context="#stay" />
         <DetectChar char="|" attribute="Special Character" context="EmbeddedItemAttributes" />
         <DetectChar char="!" attribute="Special Character" context="#pop#pop" />
       </context>
       <context name="EmbeddedItemAttributes" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&embeddedItemAttributeAndValue;" context="EmbeddedItemAttributeAndValue" lookAhead="true" />
         <RegExpr String="\w+" attribute="AttributeKeyword" context="#stay" />
         <DetectChar char="!" attribute="Special Character" context="#pop#pop#pop" />
       </context>
       <context name="EmbeddedItemAttributeAndValue" attribute="AttributeKeyword" lineEndContext="#stay">
         <DetectChar char="=" attribute="AttributeKeyword" context="EmbeddedItemAttributeValue" />
         <DetectChar char="!" attribute="Special Character" context="#pop#pop#pop#pop" />
       </context>
       <context name="EmbeddedItemAttributeValue" attribute="AttributeValue" lineEndContext="#stay">
         <DetectChar char="," attribute="Normal" context="#pop#pop" />
         <DetectChar char="!" attribute="Special Character" context="#pop#pop#pop#pop#pop" />
       </context>
 
       <context name="Panel" lineEndContext="#stay" attribute="Normal">
         <StringDetect String="{panel" attribute="Special Character" context="PanelStartTagContent" />
       </context>
       <context name="PanelStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="PanelAttributes" />
         <DetectChar char="}" attribute="Special Character" context="PanelContent" />
       </context>
       <context name="PanelContent" attribute="Normal" lineEndContext="#stay">
         <IncludeRules context="FindTextEffects" />
         <StringDetect String="{panel}" attribute="Special Character" context="#pop#pop#pop" />
       </context>
       <context name="PanelAttributes" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&panelAttributeAndValue;" context="PanelAttributeAndValue" lookAhead="true" />
         <DetectChar char="}" context="#pop" lookAhead="true" />
       </context>
       <context name="PanelAttributeAndValue" attribute="AttributeKeyword" lineEndContext="#stay">
         <DetectChar char="=" attribute="AttributeKeyword" context="PanelAttributeValue" />
         <DetectChar char="}" context="#pop#pop" lookAhead="true" />
       </context>
       <context name="PanelAttributeValue" attribute="AttributeValue" lineEndContext="#stay">
         <DetectChar char="|" attribute="Special Character" context="#pop#pop" />
         <DetectChar char="}" context="#pop#pop#pop" lookAhead="true" />
       </context>
 
       <!-- See https://confluence.atlassian.com/display/DOC/Code+Block+Macro for keywords -->
       <context name="CodeContext" lineEndContext="#stay" attribute="Normal">
           <!-- Note: Commented out lines are for languages that Jira supports but KTextEditor does not yet. -->
 <!--         <RegExpr String="\{code:(?= *actionscript3 *(\||\}))" attribute="Special Character" context="JavaCodeStartTagContent" /> -->
         <RegExpr String="\{code:(?= *bash *(\||\}))" attribute="Special Character" context="BashCodeStartTagContent" />
         <RegExpr String="\{code:(?= *csharp *(\||\}))" attribute="Special Character" context="CSharpCodeStartTagContent" />
         <RegExpr String="\{code:(?= *coldfusion *(\||\}))" attribute="Special Character" context="ColdFusionCodeStartTagContent" />
         <RegExpr String="\{code:(?= *cpp *(\||\}))" attribute="Special Character" context="CppCodeStartTagContent" />
         <RegExpr String="\{code:(?= *css *(\||\}))" attribute="Special Character" context="CssCodeStartTagContent" />
         <RegExpr String="\{code:(?= *delphi *(\||\}))" attribute="Special Character" context="PascalCodeStartTagContent" />
         <RegExpr String="\{code:(?= *diff *(\||\}))" attribute="Special Character" context="DiffCodeStartTagContent" />
         <RegExpr String="\{code:(?= *erlang *(\||\}))" attribute="Special Character" context="ErlangCodeStartTagContent" />
 <!--         <RegExpr String="\{code:(?= *groovy *(\||\}))" attribute="Special Character" context="JavaCodeStartTagContent" /> -->
         <RegExpr String="\{code:(?= *html *(\||\}))" attribute="Special Character" context="HtmlCodeStartTagContent" />
         <RegExpr String="\{code:(?= *java *(\||\}))" attribute="Special Character" context="JavaCodeStartTagContent" />
 <!--         <RegExpr String="\{code:(?= *javafx *(\||\}))" attribute="Special Character" context="JavaCodeStartTagContent" /> -->
         <RegExpr String="\{code:(?= *javascript *(\||\}))" attribute="Special Character" context="JavaScriptCodeStartTagContent" />
         <RegExpr String="\{code:(?= *none *(\||\}))" attribute="Special Character" context="NoneCodeStartTagContent" />
         <RegExpr String="\{code:(?= *perl *(\||\}))" attribute="Special Character" context="PerlCodeStartTagContent" />
         <RegExpr String="\{code:(?= *php *(\||\}))" attribute="Special Character" context="PhpCodeStartTagContent" />
 <!--         <RegExpr String="\{code:(?= *powershell *(\||\}))" attribute="Special Character" context="JavaCodeStartTagContent" /> -->
         <RegExpr String="\{code:(?= *python *(\||\}))" attribute="Special Character" context="PythonCodeStartTagContent" />
         <RegExpr String="\{code:(?= *ruby *(\||\}))" attribute="Special Character" context="RubyCodeStartTagContent" />
         <RegExpr String="\{code:(?= *scala *(\||\}))" attribute="Special Character" context="ScalaCodeStartTagContent" />
         <RegExpr String="\{code:(?= *sql *(\||\}))" attribute="Special Character" context="SqlCodeStartTagContent" />
 <!--         <RegExpr String="\{code:(?= *vb *(\||\}))" attribute="Special Character" context="JavaCodeStartTagContent" /> -->
         <RegExpr String="\{code:(?= *xml *(\||\}))" attribute="Special Character" context="XmlCodeStartTagContent" />
         <StringDetect String="{code" attribute="Special Character" context="JavaCodeStartTagContent" />
       </context>
 
       <context name="CodeAttributes" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&codeAttributeAndValue;" context="CodeAttributeAndValue" lookAhead="true" />
         <RegExpr String="&codeAttribute;" attribute="AttributeKeyword" />
         <DetectChar char="}" context="#pop" lookAhead="true" />
       </context>
       <context name="CodeAttributeAndValue" attribute="AttributeKeyword" lineEndContext="#stay">
         <DetectChar char="=" attribute="AttributeKeyword" context="CodeAttributeValue" />
         <DetectChar char="}" context="#pop#pop" lookAhead="true" />
       </context>
       <context name="CodeAttributeValue" attribute="AttributeValue" lineEndContext="#stay">
         <DetectChar char="|" attribute="Special Character" context="#pop#pop" />
         <DetectChar char="}" context="#pop#pop#pop" lookAhead="true" />
       </context>
 
       <context name="BashCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="BashCodeContent" />
       </context>
       <context name="BashCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Start##Bash" />
       </context>
 
       <context name="CSharpCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="CSharpCodeContent" />
       </context>
       <context name="CSharpCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal##C#" />
       </context>
 
       <context name="ColdFusionCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="ColdFusionCodeContent" />
       </context>
       <context name="ColdFusionCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal Text##ColdFusion" />
       </context>
 
       <context name="CppCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="CppCodeContent" />
       </context>
       <context name="CppCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal##C++" />
       </context>
 
       <context name="CssCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="CssCodeContent" />
       </context>
       <context name="CssCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Base##CSS" />
       </context>
 
       <context name="DiffCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="DiffCodeContent" />
       </context>
       <context name="DiffCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal##Diff" />
       </context>
 
       <context name="ErlangCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="ErlangCodeContent" />
       </context>
       <context name="ErlangCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal Text##Erlang" />
       </context>
 
       <context name="HtmlCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="HtmlCodeContent" />
       </context>
       <context name="HtmlCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Start##HTML" />
       </context>
 
       <context name="JavaCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="JavaCodeContent" />
       </context>
       <context name="JavaCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal##Java" />
       </context>
 
       <context name="JavaScriptCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="JavaScriptCodeContent" />
       </context>
       <context name="JavaScriptCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal##JavaScript" />
       </context>
 
       <context name="NoneCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="NoneCodeContent" />
       </context>
       <context name="NoneCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
       </context>
 
       <context name="PascalCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="PascalCodeContent" />
       </context>
       <context name="PascalCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal##Pascal" />
       </context>
 
       <context name="PerlCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="PerlCodeContent" />
       </context>
       <context name="PerlCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="normal##Perl" />
       </context>
 
       <context name="PhpCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="PhpCodeContent" />
       </context>
       <context name="PhpCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="start##PHP/PHP" />
       </context>
 
       <context name="PythonCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="PythonCodeContent" />
       </context>
       <context name="PythonCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal##Python" />
       </context>
 
       <context name="RubyCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="RubyCodeContent" />
       </context>
       <context name="RubyCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal##Ruby" />
       </context>
 
       <context name="ScalaCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="ScalaCodeContent" />
       </context>
       <context name="ScalaCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal##Scala" />
       </context>
 
       <context name="SqlCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="SqlCodeContent" />
       </context>
       <context name="SqlCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Normal##SQL" />
       </context>
 
       <context name="XmlCodeStartTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char=":" attribute="Special Character" context="CodeAttributes" />
         <DetectChar char="}" attribute="Special Character" context="XmlCodeContent" />
       </context>
       <context name="XmlCodeContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{code}" attribute="Special Character" context="#pop#pop#pop" />
         <IncludeRules context="Start##XML" />
       </context>
 
 
       <context name="UserTag" lineEndContext="#stay" attribute="Normal">
         <Detect2Chars char="[" char1="~" attribute="Special Character" context="UserTagContent" />
       </context>
       <context name="UserTagContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char="]" attribute="Special Character" context="#pop#pop" />
       </context>
 
       <context name="TaggedLink" lineEndContext="#stay" attribute="Normal">
         <DetectChar char="[" attribute="Special Character" context="TaggedLinkContent" />
       </context>
       <context name="TaggedLinkContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char="]" attribute="Special Character" context="#pop#pop" />
       </context>
 
       <context name="TaggedLinkWithDisplayText" lineEndContext="#stay" attribute="Normal">
         <DetectChar char="[" attribute="Special Character" context="TaggedLinkDisplayText" />
       </context>
       <context name="TaggedLinkDisplayText" attribute="Normal" lineEndContext="#stay">
         <DetectChar char="|" attribute="Special Character" context="TaggedLinkUrl" />
       </context>
       <context name="TaggedLinkUrl" attribute="Green" lineEndContext="#stay">
         <DetectChar char="]" attribute="Special Character" context="#pop#pop#pop" />
       </context>
 
       <context name="BraceAnchor" lineEndContext="#stay" attribute="Normal">
         <StringDetect String="{anchor:" attribute="Special Character" context="BraceAnchorContent" />
       </context>
       <context name="BraceAnchorContent" attribute="Green" lineEndContext="#stay">
         <DetectChar char="}" attribute="Special Character" context="#pop#pop" />
       </context>
 
       <!-- Text Effects -->
       <context name="BlockQuote" lineEndContext="#pop" attribute="Normal"/>
       <context name="Bold" lineEndContext="#stay" attribute="Normal">
         <DetectChar char="*" attribute="Special Character" context="BoldContent" />
       </context>
       <context name="BoldContent" attribute="Bold" lineEndContext="#stay">
         <DetectChar char="*" attribute="Special Character" context="#pop#pop" />
       </context>
       <context name="Citation" lineEndContext="#stay" attribute="Normal">
         <Detect2Chars char="?" char1="?" attribute="Special Character" context="CitationContent" />
       </context>
       <context name="CitationContent" attribute="Italic" lineEndContext="#stay">
         <Detect2Chars char="?" char1="?" attribute="Special Character" context="#pop#pop" />
       </context>
 
       <context name="Color" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{color:" context="ColorTagColor" attribute="Special Character" />
       </context>
       <context name="ColorTagColor" attribute="Normal" lineEndContext="#stay">
         <!-- Black and White have been skipped on purpose. -->
         <StringDetect String="silver}"  context="ColorSilverTagColor" lookAhead="true" />
         <StringDetect String="gray}"  context="ColorGrayTagColor" lookAhead="true" />
         <StringDetect String="red}"  context="ColorRedTagColor" lookAhead="true" />
         <StringDetect String="maroon}"  context="ColorMaroonTagColor" lookAhead="true" />
         <StringDetect String="yellow}"  context="ColorYellowTagColor" lookAhead="true" />
         <StringDetect String="olive}"  context="ColorOliveTagColor" lookAhead="true" />
         <StringDetect String="lime}"  context="ColorLimeTagColor" lookAhead="true" />
         <StringDetect String="green}"  context="ColorGreenTagColor" lookAhead="true" />
         <StringDetect String="aqua}"  context="ColorAquaTagColor" lookAhead="true" />
         <StringDetect String="teal}"  context="ColorTealTagColor" lookAhead="true" />
         <StringDetect String="blue}"  context="ColorBlueTagColor" lookAhead="true" />
         <StringDetect String="navy}"  context="ColorNavyTagColor" lookAhead="true" />
         <StringDetect String="fuchsia}"  context="ColorFuchsiaTagColor" lookAhead="true" />
         <StringDetect String="purple}"  context="ColorPurpleTagColor" lookAhead="true" />
         <DetectChar char="}"  attribute="Special Character" context="UnhighlightedColorContent" />
       </context>
       <context name="UnhighlightedColorContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{color}" attribute="Special Character" context="#pop#pop#pop" />
       </context>
       <context name="HighlightedColorContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{color}" attribute="Special Character" context="#pop#pop#pop#pop" />
       </context>
       <context name="ColorSilverTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="silver" attribute="Silver" />
         <DetectChar char="}" attribute="Special Character" context="SilverContent" />
       </context>
       <context name="SilverContent" attribute="Silver" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorGrayTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="gray" attribute="Gray" />
         <DetectChar char="}" attribute="Special Character" context="GrayContent" />
       </context>
       <context name="GrayContent" attribute="Gray" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorRedTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="red" attribute="Red" />
         <DetectChar char="}" attribute="Special Character" context="RedContent" />
       </context>
       <context name="RedContent" attribute="Red" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorMaroonTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="maroon" attribute="Maroon" />
         <DetectChar char="}" attribute="Special Character" context="MaroonContent" />
       </context>
       <context name="MaroonContent" attribute="Maroon" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorYellowTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="yellow" attribute="Yellow" />
         <DetectChar char="}" attribute="Special Character" context="YellowContent" />
       </context>
       <context name="YellowContent" attribute="Yellow" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorOliveTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="olive" attribute="Olive" />
         <DetectChar char="}" attribute="Special Character" context="OliveContent" />
       </context>
       <context name="OliveContent" attribute="Olive" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorLimeTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="lime" attribute="Lime" />
         <DetectChar char="}" attribute="Special Character" context="LimeContent" />
       </context>
       <context name="LimeContent" attribute="Lime" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorGreenTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="green" attribute="Green" />
         <DetectChar char="}" attribute="Special Character" context="GreenContent" />
       </context>
       <context name="GreenContent" attribute="Green" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorAquaTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="aqua" attribute="Aqua" />
         <DetectChar char="}" attribute="Special Character" context="AquaContent" />
       </context>
       <context name="AquaContent" attribute="Aqua" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorTealTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="teal" attribute="Teal" />
         <DetectChar char="}" attribute="Special Character" context="TealContent" />
       </context>
       <context name="TealContent" attribute="Teal" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorBlueTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="blue" attribute="Blue" />
         <DetectChar char="}" attribute="Special Character" context="BlueContent" />
       </context>
       <context name="BlueContent" attribute="Blue" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorNavyTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="navy" attribute="Navy" />
         <DetectChar char="}" attribute="Special Character" context="NavyContent" />
       </context>
       <context name="NavyContent" attribute="Navy" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorFuchsiaTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="fuchsia" attribute="Fuchsia" />
         <DetectChar char="}" attribute="Special Character" context="FuchsiaContent" />
       </context>
       <context name="FuchsiaContent" attribute="Fuchsia" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
       <context name="ColorPurpleTagColor" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="purple" attribute="Purple" />
         <DetectChar char="}" attribute="Special Character" context="PurpleContent" />
       </context>
       <context name="PurpleContent" attribute="Purple" lineEndContext="#stay">
         <IncludeRules context="HighlightedColorContent" />
       </context>
 
       <context name="Deleted" attribute="Normal" lineEndContext="#stay">
         <DetectChar char="-" attribute="Special Character" context="DeletedContent" />
       </context>
       <context name="DeletedContent" attribute="Stroked Out" lineEndContext="#stay">
         <DetectChar char="-" attribute="Special Character" context="#pop#pop" />
       </context>
       <context name="Inserted" attribute="Normal" lineEndContext="#stay">
         <DetectChar char="+" attribute="Special Character" context="InsertedContent" />
       </context>
       <context name="InsertedContent" attribute="Underlined" lineEndContext="#stay">
         <DetectChar char="+" attribute="Special Character" context="#pop#pop" />
       </context>
       <context name="Italic" attribute="Normal" lineEndContext="#stay">
         <DetectChar char="_" attribute="Special Character" context="ItalicContent" />
       </context>
       <context name="ItalicContent" attribute="Italic" lineEndContext="#stay">
         <DetectChar char="_" attribute="Special Character" context="#pop#pop" />
       </context>
       <context name="Monospaced" attribute="Normal" lineEndContext="#stay">
         <Detect2Chars char="}" char1="}" attribute="Special Character" context="#pop" />
         <Detect2Chars char="{" char1="{" attribute="Special Character" />
       </context>
       <context name="Quote" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="{quote}" context="#pop" attribute="Special Character" />
       </context>
       <context name="Subscript" attribute="Normal" lineEndContext="#stay">
         <DetectChar char="~" attribute="Special Character" context="SubscriptContent" />
       </context>
       <context name="SubscriptContent" attribute="Normal" lineEndContext="#stay">
         <DetectChar char="~" attribute="Special Character" context="#pop#pop" />
       </context>
       <context name="Superscript" attribute="Normal" lineEndContext="#stay">
         <DetectChar char="^" attribute="Special Character" context="SuperscriptContent" />
       </context>
       <context name="SuperscriptContent" attribute="Normal" lineEndContext="#stay">
         <DetectChar char="^" attribute="Special Character" context="#pop#pop" />
       </context>
 
       <context name="TableHeaderRow" attribute="Bold" lineEndContext="#pop">
         <Detect2Chars char="|" char1="|" attribute="Special Character" context="#stay" />
       </context>
       <context name="TableRegularRow" attribute="Normal" lineEndContext="#pop">
         <DetectChar char="|" attribute="Special Character" context="#stay" />
       </context>
 
       <context name="NoFormat" attribute="Normal" lineEndContext="#stay" >
         <StringDetect String="{noformat}" attribute="Special Character" context="#pop" />
       </context>
 
 
       <!-- Rules to Include -->
 
       <!-- BlockQuotes -->
       <context name="FindBlockQuote" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="bq\. " context="BlockQuote" attribute="Special Character" column="0" />
       </context>
 
       <!-- Colors -->
       <context name="FindColor" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="\{color:[^}]+\}" context="Color" lookAhead="true" />
       </context>
 
       <!-- Headings -->
       <context name="FindHeader" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="h[1-6]\. " context="Header" attribute="Special Character" column="0" />
       </context>
 
       <!-- Quotes -->
       <context name="FindQuote" attribute="Normal" lineEndContext="#stay" >
         <StringDetect String="{quote}" context="Quote" attribute="Special Character" />
       </context>
 
       <!-- Text Breaks -->
       <context name="FindTextBreaks" attribute="Normal" lineEndContext="#stay" >
         <Detect2Chars char="\" char1="\" attribute="Special Character" />
         <StringDetect String="----" attribute="Special Character" />
         <StringDetect String="---" attribute="Special Character" />
         <Detect2Chars char="-" char1="-" attribute="Special Character" />
       </context>
 
       <!-- Embedded Items -->
       <context name="FindEmbeddedItems" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="&embeddedItem;" context="EmbeddedItem" lookAhead="true" />
       </context>
 
       <!-- Links -->
       <context name="FindLinks" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="&bracketAnchor;" context="BracketAnchor" lookAhead="true" />
         <RegExpr String="&attachment;" context="AttachmentLink" lookAhead="true" />
         <RegExpr String="&userTag;" context="UserTag" lookAhead="true" />
         <RegExpr String="&taggedLink;" context="TaggedLink" lookAhead="true" />
         <RegExpr String="&taggedLinkWithDisplayText;" context="TaggedLinkWithDisplayText" lookAhead="true" />
         <RegExpr String="\{anchor:[^}]+\}" context="BraceAnchor" lookAhead="true" />
         <RegExpr String="&url;" attribute="Green" />
       </context>
 
       <!-- Lists -->
       <context name="FindListItem" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="([*#]*[*#]+|-)" attribute="Special Character" context="#stay" column="0" />
       </context>
 
       <!-- Text Effects -->
       <context name="FindTextEffects" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="&citation;" context="Citation" lookAhead="true" />
         <RegExpr String="&deleted;" context="Deleted" lookAhead="true" />
         <RegExpr String="&emphasis;" context="Italic" lookAhead="true" />
         <RegExpr String="&inserted;" context="Inserted" lookAhead="true" />
         <RegExpr String="&strong;" context="Bold" lookAhead="true" />
         <RegExpr String="&subscript;" context="Subscript" lookAhead="true" />
         <RegExpr String="&superscript;" context="Superscript" lookAhead="true" />
         <RegExpr String="&monospaced;" context="Monospaced" lookAhead="true" />
       </context>
 
       <!-- Tables -->
       <context name="FindTables" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="^\|\|" context="TableHeaderRow" lookAhead="true" />
         <RegExpr String="^\|" context="TableRegularRow" lookAhead="true" />
       </context>
 
       <!-- No format -->
       <context name="FindNoFormat" attribute="Normal" lineEndContext="#stay" >
         <StringDetect String="{noformat}" context="NoFormat" attribute="Special Character" />
       </context>
 
       <!-- Panels -->
       <context name="FindPanels" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="&panel;" context="Panel" lookAhead="true" />
       </context>
 
       <!-- Code -->
       <context name="FindCode" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="&code;" context="CodeContext" lookAhead="true" />
       </context>
 
       <!-- Escape Sequences -->
       <context name="FindEscapeSequences" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="\\[^ \\]" attribute="EscapeSequence" />
       </context>
 
       <!-- Line Breaks -->
       <context name="FindLineBreaks" attribute="Normal" lineEndContext="#stay" >
         <RegExpr String="\\$" attribute="Special Character" />
       </context>
 
       <!-- Icons -->
       <context name="FindIcons" attribute="Normal" lineEndContext="#stay" >
         <StringDetect String=":)" attribute="Special Character" />
         <StringDetect String=":(" attribute="Special Character" />
         <StringDetect String=":P" attribute="Special Character" />
         <StringDetect String=":D" attribute="Special Character" />
         <StringDetect String=";)" attribute="Special Character" />
         <StringDetect String="(y)" attribute="Special Character" />
         <StringDetect String="(n)" attribute="Special Character" />
         <StringDetect String="(i)" attribute="Special Character" />
         <StringDetect String="(/)" attribute="Special Character" />
         <StringDetect String="(x)" attribute="Special Character" />
         <StringDetect String="(!)" attribute="Special Character" />
         <StringDetect String="(+)" attribute="Special Character" />
         <StringDetect String="(-)" attribute="Special Character" />
         <StringDetect String="(?)" attribute="Special Character" />
         <StringDetect String="(on)" attribute="Special Character" />
         <StringDetect String="(off)" attribute="Special Character" />
         <StringDetect String="(*)" attribute="Special Character" />
         <StringDetect String="(*r)" attribute="Special Character" />
         <StringDetect String="(*g)" attribute="Special Character" />
         <StringDetect String="(*b)" attribute="Special Character" />
         <StringDetect String="(*y)" attribute="Special Character" />
       </context>
 
     </contexts>
     <itemDatas>
       <itemData name="Normal" defStyleNum="dsNormal" /><!-- Must be first. -->
 
       <itemData name="Bold" defStyleNum="dsNormal" bold="true" />
       <itemData name="Header" defStyleNum="dsKeyword" />
       <itemData name="Italic" defStyleNum="dsNormal" italic="true" />
       <itemData name="Special Character" defStyleNum="dsDecVal" bold="true" />
       <itemData name="Stroked Out" defStyleNum="dsNormal" strikeOut="true" />
       <itemData name="Underlined" defStyleNum="dsNormal" underline="true" />
       <itemData name="AttributeKeyword" defStyleNum="dsOthers" spellChecking="false" />
       <itemData name="AttributeValue" defStyleNum="dsString" spellChecking="false" />
       <itemData name="EscapeSequence" defStyleNum="dsChar" spellChecking="false" />
 
       <!-- Colors -->
       <itemData name="Silver" defStyleNum="dsNormal" color="silver" />
       <itemData name="Gray" defStyleNum="dsNormal" color="gray" />
       <itemData name="Red" defStyleNum="dsNormal" color="red" />
       <itemData name="Maroon" defStyleNum="dsNormal" color="maroon" />
       <itemData name="Yellow" defStyleNum="dsNormal" color="yellow" />
       <itemData name="Olive" defStyleNum="dsNormal" color="olive" />
       <itemData name="Lime" defStyleNum="dsNormal" color="lime" />
       <itemData name="Green" defStyleNum="dsNormal" color="green" />
       <itemData name="Aqua" defStyleNum="dsNormal" color="aqua" />
       <itemData name="Teal" defStyleNum="dsNormal" color="teal" />
       <itemData name="Blue" defStyleNum="dsNormal" color="blue" />
       <itemData name="Navy" defStyleNum="dsNormal" color="navy" />
       <itemData name="Fuchsia" defStyleNum="dsNormal" color="fuchsia" />
       <itemData name="Purple" defStyleNum="dsNormal" color="purple" />
     </itemDatas>
   </highlighting>
   <general>
     <keywords casesensitive="0" />
-    <indentation mode="normal" />
   </general>
 </language>
diff --git a/data/syntax/mediawiki.xml b/data/syntax/mediawiki.xml
index 72e2e5d..accd0ec 100644
--- a/data/syntax/mediawiki.xml
+++ b/data/syntax/mediawiki.xml
@@ -1,623 +1,622 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE language SYSTEM "language.dtd" [
   <!ENTITY url          "(http:|https:|ftp:|mailto:)[^]| ]*(?=$|[]|\s])">
   <!ENTITY htmlTagName  "(?![0-9])[\w_:][\w.:_-]*">
   <!ENTITY htmlEntity   "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&htmlTagName;);">
   <!ENTITY wikiLinkWithDescription "\[\[[^]|]*\|[^]]*\]\]">
   <!ENTITY wikiLinkWithoutDescription "\[\[[^]|]*\]\]">
 ]>
-<language name="MediaWiki" section="Markup" version="4" kateversion="3.4" extensions="*.mediawiki" mimetype="" license="FDL" >
+<language name="MediaWiki" section="Markup" version="5" kateversion="3.4" extensions="*.mediawiki" mimetype="" license="FDL" >
   <highlighting>
     <contexts>
       <context attribute="Normal" lineEndContext="#stay" name="normal" >
         <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
         <RegExpr String="[=]{5,5}(?!=)" context="Section5" attribute="Section" column="0" />
         <RegExpr String="[=]{4,4}(?!=)" context="Section4" attribute="Section" column="0" />
         <RegExpr String="[=]{3,3}(?!=)" context="Section3" attribute="Section" column="0" />
         <RegExpr String="[=]{2,2}(?!=)" context="Section2" attribute="Section" column="0" />
         <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
         <DetectChar char=";" attribute="WikiTag" context="DefinitionListHeader" column="0" />
         <IncludeRules context="FindListItem" />
         <IncludeRules context="FindUrl" />
         <IncludeRules context="FindTextDecorations" />
         <IncludeRules context="FindTable" />
         <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
         <IncludeRules context="FindTemplate" />
         <IncludeRules context="FindWikiLink" />
         <IncludeRules context="FindHtmlEntities" />
         <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="WikiTag" />
         <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
         <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
         <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
         <RegExpr String="[\s]" context="Unformatted" column="0" />
       </context>
       <context name="TableHeader" attribute="Normal" lineEndContext="TableContent" >
         <Detect2Chars char="{" char1="|" attribute="WikiTag" beginRegion="table" />
         <IncludeRules context="FindHtmlStartTagAttributes" />
       </context>
       <context name="TableContent" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="&lt;!--" context="comment" attribute="Comment" />
         <RegExpr String="[=]{5,5}(?!=)" context="Section5" attribute="Section" column="0" />
         <RegExpr String="[=]{4,4}(?!=)" context="Section4" attribute="Section" column="0" />
         <RegExpr String="[=]{3,3}(?!=)" context="Section3" attribute="Section" column="0" />
         <RegExpr String="[=]{2,2}(?!=)" context="Section2" attribute="Section" column="0" />
         <DetectChar char=";" attribute="WikiTag" context="DefinitionListHeader" column="0" />
         <IncludeRules context="FindListItem" />
         <IncludeRules context="FindUrl" />
         <IncludeRules context="FindTextDecorations" />
         <IncludeRules context="FindTable" />
         <Detect2Chars char="|" char1="}" column="0" attribute="WikiTag" context="#pop#pop" endRegion="table" />
         <Detect2Chars char="|" char1="-" column="0" attribute="WikiTag" />
         <DetectChar char="|" attribute="WikiTag" context="#stay"/>
         <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
         <IncludeRules context="FindTemplate" />
         <IncludeRules context="FindWikiLink" />
         <IncludeRules context="FindHtmlEntities" />
         <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="WikiTag" />
         <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
         <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
         <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
         <RegExpr String="[\s]" context="Unformatted" column="0" />
         <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
         <RegExpr String="[-]{4,}" attribute="WikiTag" context="#stay" />
         <DetectChar char="!" attribute="WikiTag" context="#stay" column="0" />
       </context>
       <context attribute="Section" lineEndContext="#pop" name="Section5" >
         <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
         <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
         <IncludeRules context="FindUrl" />
         <IncludeRules context="FindTextDecorationsInHeader" />
         <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
         <IncludeRules context="FindTemplate" />
         <IncludeRules context="FindWikiLink" />
         <IncludeRules context="FindHtmlEntities" />
         <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
         <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
         <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
         <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
         <RegExpr String="={6,} *$" context="#pop" attribute="Normal" />
         <RegExpr String="={5,5} *$" context="#pop" attribute="Section" />
         <RegExpr String="={1,4} *$" context="#pop" attribute="Normal" />
         <RegExpr String="={1,4} *$" context="#pop" attribute="Normal" />
         <RegExpr String="=*[^=]+$" context="#pop" attribute="Normal" />
       </context>
       <context attribute="Section" lineEndContext="#pop" name="Section4" >
         <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
         <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
         <IncludeRules context="FindUrl" />
         <IncludeRules context="FindTextDecorationsInHeader" />
         <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
         <IncludeRules context="FindTemplate" />
         <IncludeRules context="FindWikiLink" />
         <IncludeRules context="FindHtmlEntities" />
         <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
         <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
         <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
         <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
         <RegExpr String="={5,} *$" context="#pop" attribute="Normal" />
         <RegExpr String="={4,4} *$" context="#pop" attribute="Section" />
         <RegExpr String="={1,3} *$" context="#pop" attribute="Normal" />
         <RegExpr String="=*[^=]+$" context="#pop" attribute="Normal" />
       </context>
       <context attribute="Section" lineEndContext="#pop" name="Section3" >
         <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
         <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
         <IncludeRules context="FindUrl" />
         <IncludeRules context="FindTextDecorationsInHeader" />
         <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
         <IncludeRules context="FindTemplate" />
         <IncludeRules context="FindWikiLink" />
         <IncludeRules context="FindHtmlEntities" />
         <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
         <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
         <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
         <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
         <RegExpr String="={4,} *$" context="#pop" attribute="Normal" />
         <RegExpr String="={3,3} *$" context="#pop" attribute="Section" />
         <RegExpr String="={1,2} *$" context="#pop" attribute="Normal" />
         <RegExpr String="=*[^=]+$" context="#pop" attribute="Normal" />
       </context>
       <context attribute="Section" lineEndContext="#pop" name="Section2" >
         <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
         <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
         <IncludeRules context="FindUrl" />
         <IncludeRules context="FindTextDecorationsInHeader" />
         <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
         <IncludeRules context="FindTemplate" />
         <IncludeRules context="FindWikiLink" />
         <IncludeRules context="FindHtmlEntities" />
         <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
         <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
         <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
         <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
         <RegExpr String="={3,} *$" context="#pop" attribute="Normal" />
         <RegExpr String="={2,2} *$" context="#pop" attribute="Section" />
         <RegExpr String="={1,1} *$" context="#pop" attribute="Normal" />
         <RegExpr String="=*[^=]+$" context="#pop" attribute="Normal" />
       </context>
       <context attribute="Comment" lineEndContext="#stay" name="comment" >
         <StringDetect String="--&gt;" context="#pop" attribute="Comment" endRegion="comment" />
       </context>
       <context attribute="Link" lineEndContext="#stay" name="DelimitedURL" >
         <DetectChar char="]" context="#pop" attribute="WikiTag" />
         <DetectChar char="[" context="#stay" attribute="WikiTag" />
         <RegExpr String="&url;" context="DelimitedUrlLink" lookAhead="true" />
         <DetectChar char=" " context="URLTag" attribute="WikiTag" />
       </context>
       <context attribute="Link" lineEndContext="#stay" name="DelimitedUrlLink" >
         <IncludeRules context="FindTemplate" />
         <DetectChar char=" " context="#pop" lookAhead="true" />
         <DetectChar char="]" context="#pop" lookAhead="true" />
       </context>
 
       <context attribute="Link" lineEndContext="#pop" name="LooseURL" >
         <IncludeRules context="FindTemplate" />
         <DetectChar char=" " context="#pop" attribute="WikiTag" />
       </context>
       <context attribute="Link" lineEndContext="#pop" name="LooseURLWithinTemplate" >
         <IncludeRules context="FindTemplate" />
         <Detect2Chars char="}" char1="}" context="#pop" lookAhead="true" />
         <DetectChar char=" " context="#pop" attribute="WikiTag" />
       </context>
 
       <context attribute="Normal" lineEndContext="#stay" name="URLTag" >
         <IncludeRules context="FindTextDecorations" />
         <IncludeRules context="FindTemplate" />
         <DetectChar char="]" context="#pop" lookAhead="true" />
       </context>
 
       <context name="WikiLinkWithoutDescriptionRules" attribute="Normal" lineEndContext="#stay" >
         <IncludeRules context="FindTemplate" />
         <IncludeRules context="FindHtmlEntities" />
         <Detect2Chars char="[" char1="[" attribute="WikiTag" />
         <Detect2Chars char="]" char1="]" context="#pop" attribute="WikiTag" />
       </context>
       <context name="WikiLinkWithDescriptionRules" attribute="Normal" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithoutDescriptionRules" />
         <DetectChar char="#" attribute="WikiTag" />
       </context>
       <context name="WikiLink" attribute="Link" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithDescriptionRules" />
         <DetectChar char="|" attribute="WikiTag" context="WikiLinkDescription" />
       </context>
       <context name="WikiLinkBoldWithDescription" attribute="Link" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithDescriptionRules" />
         <DetectChar char="|" attribute="WikiTag" context="WikiLinkDescriptionBold" />
       </context>
       <context name="WikiLinkBoldWithoutDescription" attribute="LinkBold" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithoutDescriptionRules" />
         <DetectChar char="#" attribute="WikiTagBold" />
       </context>
       <context name="WikiLinkItalicWithDescription" attribute="Link" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithDescriptionRules" />
         <DetectChar char="|" attribute="WikiTag" context="WikiLinkDescriptionItalic" />
       </context>
       <context name="WikiLinkItalicWithoutDescription" attribute="LinkItalic" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithoutDescriptionRules" />
         <DetectChar char="#" attribute="WikiTagItalic" />
       </context>
       <context name="WikiLinkUnderlinedWithDescription" attribute="Link" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithDescriptionRules" />
         <DetectChar char="|" attribute="WikiTag" context="WikiLinkDescriptionUnderlined" />
       </context>
       <context name="WikiLinkUnderlinedWithoutDescription" attribute="LinkUnderlined" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithoutDescriptionRules" />
         <DetectChar char="#" attribute="WikiTagUnderlined" />
       </context>
       <context name="WikiLinkBoldItalicWithDescription" attribute="Link" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithDescriptionRules" />
         <DetectChar char="|" attribute="WikiTag" context="WikiLinkDescriptionBoldItalic" />
       </context>
       <context name="WikiLinkBoldItalicWithoutDescription" attribute="LinkBoldItalic" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithoutDescriptionRules" />
         <DetectChar char="#" attribute="WikiTagBoldItalic" />
       </context>
       <context name="WikiLinkBoldUnderlinedWithDescription" attribute="Link" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithDescriptionRules" />
         <DetectChar char="|" attribute="WikiTag" context="WikiLinkDescriptionBoldUnderlined" />
       </context>
       <context name="WikiLinkBoldUnderlinedWithoutDescription" attribute="LinkBoldUnderlined" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithoutDescriptionRules" />
         <DetectChar char="#" attribute="WikiTagBoldUnderlined" />
       </context>
       <context name="WikiLinkItalicUnderlinedWithDescription" attribute="Link" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithDescriptionRules" />
         <DetectChar char="|" attribute="WikiTag" context="WikiLinkDescriptionItalicUnderlined" />
       </context>
       <context name="WikiLinkItalicUnderlinedWithoutDescription" attribute="LinkItalicUnderlined" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithoutDescriptionRules" />
         <DetectChar char="#" attribute="WikiTagItalicUnderlined" />
       </context>
       <context name="WikiLinkBoldItalicUnderlinedWithDescription" attribute="Link" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkWithDescriptionRules" />
         <DetectChar char="|" attribute="WikiTag" context="WikiLinkDescriptionBoldItalicUnderlined" />
       </context>
       <context name="WikiLinkBoldItalicUnderlinedWithoutDescription" attribute="LinkBoldItalicUnderlined" lineEndContext="#stay" >
         <DetectChar char="#" attribute="WikiTagBoldItalicUnderlined" />
         <IncludeRules context="WikiLinkWithoutDescriptionRules" />
       </context>
 
       <context name="WikiLinkDescriptionRules" attribute="Normal" lineEndContext="#stay">
         <IncludeRules context="FindTemplate" />
         <IncludeRules context="FindHtmlEntities" />
         <Detect2Chars char="]" char1="]" context="#pop" attribute="WikiTag" lookAhead="true" />
       </context>
       <context name="WikiLinkDescription" attribute="Normal" lineEndContext="#stay">
         <IncludeRules context="WikiLinkDescriptionRules" />
         <IncludeRules context="FindTextDecorations" />
       </context>
       <context name="WikiLinkDescriptionBold" attribute="Bold" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkDescriptionRules" />
         <StringDetect String="''" context="BoldItalic" attribute="WikiTag" />
         <RegExpr String="&lt;u *&gt;" attribute="HtmlTag" context="BoldUnderlined" />
       </context>
       <context name="WikiLinkDescriptionItalic" attribute="Italic" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkDescriptionRules" />
         <StringDetect String="'''" attribute="WikiTag" context="ItalicBold" />
         <RegExpr String="&lt;u *&gt;" attribute="HtmlTag" context="ItalicUnderlined" />
       </context>
       <context name="WikiLinkDescriptionUnderlined" attribute="Underlined" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkDescriptionRules" />
         <StringDetect String="'''" context="UnderlinedBold" attribute="WikiTag" />
         <StringDetect String="''" context="UnderlinedItalic" attribute="WikiTag" />
       </context>
       <context name="WikiLinkDescriptionBoldItalic" attribute="BoldItalic" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkDescriptionRules" />
         <RegExpr String="&lt;u *&gt;" attribute="HtmlTag" context="BoldItalicUnderlined" />
       </context>
       <context name="WikiLinkDescriptionBoldUnderlined" attribute="BoldUnderlined" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkDescriptionRules" />
         <StringDetect String="''" context="BoldUnderlinedItalic" attribute="WikiTag" />
       </context>
       <context name="WikiLinkDescriptionItalicUnderlined" attribute="ItalicUnderlined" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkDescriptionRules" />
         <StringDetect String="'''" context="ItalicUnderlinedBold" attribute="WikiTag" />
       </context>
       <context name="WikiLinkDescriptionBoldItalicUnderlined" attribute="BoldItalicUnderlined" lineEndContext="#stay" >
         <IncludeRules context="WikiLinkDescriptionRules" />
       </context>
 
       <context attribute="TemplateName" lineEndContext="#stay" name="Template" >
         <StringDetect String="|" context="TemplateParameterSlot" attribute="WikiTag" />
         <Detect2Chars char="}" char1="}" context="#pop" attribute="WikiTag" endRegion="template" />
       </context>
       <context attribute="Normal" lineEndContext="#stay" name="TemplateParameterSlot" >
         <Detect2Chars char="}" char1="}" context="#pop" attribute="WikiTag" lookAhead="true" />
         <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
         <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
         <IncludeRules context="FindListItem" />
         <IncludeRules context="FindUrlWithinTemplate" />
         <IncludeRules context="FindTextDecorations" />
         <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
         <IncludeRules context="FindTemplate" />
         <IncludeRules context="FindWikiLink" />
         <IncludeRules context="FindHtmlEntities" />
         <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
         <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
         <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
         <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
         <StringDetect String="|" context="#pop" attribute="WikiTag" lookAhead="true" />
         <RegExpr String="[^{}|=]+(?=[=])" attribute="Parameter" context="TemplateParameterSlotEqual" />
       </context>
       <context attribute="Normal" lineEndContext="#stay" name="TemplateParameterSlotEqual" >
         <Detect2Chars char="}" char1="}" context="#pop" attribute="WikiTag" lookAhead="true" />
         <StringDetect String="|" context="#pop" attribute="WikiTag" lookAhead="true" />
         <StringDetect String="=" context="TemplateParameterSlotValue" attribute="WikiTag" />
       </context>
       <context attribute="Normal" lineEndContext="#stay" name="TemplateParameterSlotValue" >
         <StringDetect String="&lt;!--" context="comment" attribute="Comment" beginRegion="comment" />
         <RegExpr String="[~]{3,4}" attribute="WikiTag" context="#stay" />
         <IncludeRules context="FindListItem" />
         <IncludeRules context="FindUrlWithinTemplate" />
         <IncludeRules context="FindTextDecorations" />
         <StringDetect String="{{{" context="TemplateParameter" attribute="WikiTag" />
         <IncludeRules context="FindTemplate" />
         <IncludeRules context="FindWikiLink" />
         <IncludeRules context="FindHtmlEntities" />
         <StringDetect String="&lt;nowiki&gt;" context="NoWiki" attribute="HtmlTag" />
         <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
         <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
         <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
         <Detect2Chars char="}" char1="}" context="#pop" attribute="WikiTag" lookAhead="true" />
         <StringDetect String="|" context="#pop" attribute="WikiTag" lookAhead="true" />
       </context>
       <context attribute="Parameter" lineEndContext="#stay" name="TemplateParameter" >
         <StringDetect String="}}}" context="#pop" attribute="WikiTag" />
       </context>
       <context attribute="NoWiki" lineEndContext="#stay" name="NoWiki" >
         <RegExpr String="&lt;!--[^-]*--&gt;" attribute="NoWiki" />
         <StringDetect String="&lt;/nowiki&gt;" context="#pop" attribute="HtmlTag" />
         <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
         <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
       </context>
       <context attribute="Unformatted" lineEndContext="#pop" name="Unformatted" />
       <context attribute="NoWiki" lineEndContext="#stay" name="Pre" >
         <StringDetect String="&lt;/pre&gt;" context="#pop" attribute="HtmlTag" />
       </context>
 
 
 
       <!-- <source> and <syntaxhighlight> tags. -->
 
       <context name="SourceStartTag" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="(^|\s+)lang\=(&quot;javascript&quot;|&apos;javascript&apos;)" context="JavaScriptSourceStartTag" lookAhead="true" />
         <DetectChar attribute="HtmlTag" context="UnsupportedLanguageSourceStartTag" char="&gt;" lookAhead="true" />
         <IncludeRules context="FindHtmlStartTagAttributes" />
       </context>
       <context name="SyntaxHighlightStartTag" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="(^|\s+)lang\=(&quot;javascript&quot;|&apos;javascript&apos;)" context="JavaScriptSyntaxHighlightStartTag" lookAhead="true" />
         <DetectChar attribute="HtmlTag" context="UnsupportedLanguageSyntaxHighlightStartTag" char="&gt;" lookAhead="true" />
         <IncludeRules context="FindHtmlStartTagAttributes" />
       </context>
 
 
       <context name="UnsupportedLanguageSourceStartTag" attribute="Normal" lineEndContext="#stay">
         <DetectChar attribute="HtmlTag" context="UnsupportedLanguageSourceContent" char="&gt;" />
         <IncludeRules context="FindHtmlStartTagAttributes" />
       </context>
       <context name="UnsupportedLanguageSyntaxHighlightStartTag" attribute="Normal" lineEndContext="#stay">
         <DetectChar attribute="HtmlTag" context="UnsupportedLanguageSyntaxHighlightContent" char="&gt;" />
         <IncludeRules context="FindHtmlStartTagAttributes" />
       </context>
 
       <context name="JavaScriptSourceStartTag" attribute="Normal" lineEndContext="#stay">
         <DetectChar attribute="HtmlTag" context="JavaScriptSourceContent" char="&gt;" />
         <IncludeRules context="FindHtmlStartTagAttributes" />
       </context>
       <context name="JavaScriptSyntaxHighlightStartTag" attribute="Normal" lineEndContext="#stay">
         <DetectChar attribute="HtmlTag" context="JavaScriptSyntaxHighlightContent" char="&gt;" />
         <IncludeRules context="FindHtmlStartTagAttributes" />
       </context>
 
 
       <context name="UnsupportedLanguageSourceContent" attribute="NoWiki" lineEndContext="#stay">
         <IncludeRules context="SourceEnd" />
       </context>
       <context name="UnsupportedLanguageSyntaxHighlightContent" attribute="NoWiki" lineEndContext="#stay">
         <IncludeRules context="SyntaxHighlightEnd" />
       </context>
 
       <context name="JavaScriptSourceContent" attribute="NoWiki" lineEndContext="#stay">
         <IncludeRules context="SourceEnd" />
         <IncludeRules context="Normal##JavaScript" />
       </context>
       <context name="JavaScriptSyntaxHighlightContent" attribute="NoWiki" lineEndContext="#stay">
         <StringDetect String="&lt;/syntaxhighlight&gt;" context="#pop#pop#pop" attribute="HtmlTag" />
         <IncludeRules context="SyntaxHighlightEnd" />
         <IncludeRules context="Normal##JavaScript" />
       </context>
 
 
       <context name="SourceEnd" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="&lt;/source&gt;" context="#pop#pop#pop" attribute="HtmlTag" />
       </context>
       <context name="SyntaxHighlightEnd" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="&lt;/syntaxhighlight&gt;" context="#pop#pop#pop" attribute="HtmlTag" />
       </context>
 
 
       <context name="HtmlAttribute" attribute="Normal" lineEndContext="#stay">
         <DetectChar attribute="HtmlAttribute" context="HtmlValue" char="=" />
         <RegExpr attribute="Error" context="#stay" String="\S" />
       </context>
       <context name="HtmlValue" attribute="Normal" lineEndContext="#stay">
         <DetectChar attribute="HtmlValue" context="ValueWithDoubleQuotes" char="&quot;" />
         <DetectChar attribute="HtmlValue" context="ValueWithSingleQuotes" char="&apos;" />
         <RegExpr attribute="Error" context="#stay" String="\S" />
       </context>
       <context name="ValueWithDoubleQuotes" attribute="HtmlValue" lineEndContext="#stay">
         <DetectChar attribute="HtmlValue" context="#pop#pop#pop" char="&quot;" />
         <IncludeRules context="FindHtmlEntities" />
       </context>
       <context name="ValueWithSingleQuotes" attribute="HtmlValue" lineEndContext="#stay">
         <DetectChar attribute="HtmlValue" context="#pop#pop#pop" char="&apos;" />
         <IncludeRules context="FindHtmlEntities" />
       </context>
 
 
 
       <context attribute="DefinitionListHeader" lineEndContext="#pop" name="DefinitionListHeader" >
         <DetectChar char=":" context="#pop" attribute="WikiTag" />
       </context>
       <context attribute="Bold" lineEndContext="#pop" name="Bold" >
         <IncludeRules context="FindTemplate" />
         <StringDetect String="'''" context="#pop" attribute="WikiTag" />
         <StringDetect String="''" context="BoldItalic" attribute="WikiTag" />
         <RegExpr String="&lt;u *&gt;" attribute="HtmlTag" context="BoldUnderlined" />
         <IncludeRules context="FindWikiLinkBeingBold" />
       </context>
       <context attribute="Italic" lineEndContext="#pop" name="Italic" >
         <IncludeRules context="FindTemplate" />
         <StringDetect String="'''" attribute="WikiTag" context="ItalicBold" />
         <StringDetect String="''" context="#pop" attribute="WikiTag" />
         <RegExpr String="&lt;u *&gt;" attribute="HtmlTag" context="ItalicUnderlined" />
         <IncludeRules context="FindWikiLinkBeingItalic" />
       </context>
       <context attribute="Underlined" name="Underlined" lineEndContext="#stay" >
         <IncludeRules context="FindTemplate" />
         <StringDetect String="'''" context="UnderlinedBold" attribute="WikiTag" />
         <StringDetect String="''" context="UnderlinedItalic" attribute="WikiTag" />
         <RegExpr String="&lt;/u *&gt;" context="#pop" attribute="HtmlTag" />
         <IncludeRules context="FindWikiLinkBeingUnderlined" />
       </context>
       <context name="BoldItalic" attribute="BoldItalic" lineEndContext="#pop" >
         <IncludeRules context="FindTemplate" />
         <StringDetect String="''" context="#pop" attribute="WikiTag" />
         <RegExpr String="&lt;u *&gt;" attribute="HtmlTag" context="BoldItalicUnderlined" />
         <IncludeRules context="FindWikiLinkBeingBoldItalic" />
       </context>
       <context name="ItalicBold" attribute="BoldItalic" lineEndContext="#pop" >
         <IncludeRules context="FindTemplate" />
         <StringDetect String="'''" context="#pop" attribute="WikiTag" />
         <RegExpr String="&lt;u *&gt;" attribute="HtmlTag" context="BoldItalicUnderlined" />
         <IncludeRules context="FindWikiLinkBeingBoldItalic" />
       </context>
       <context name="BoldUnderlined" attribute="BoldUnderlined" lineEndContext="#pop" >
         <IncludeRules context="FindTemplate" />
         <RegExpr String="&lt;/u *&gt;" context="#pop" attribute="HtmlTag" />
         <StringDetect String="''" context="BoldUnderlinedItalic" attribute="WikiTag" />
         <IncludeRules context="FindWikiLinkBeingBoldUnderlined" />
       </context>
       <context name="UnderlinedBold" attribute="BoldUnderlined" lineEndContext="#pop" >
         <IncludeRules context="FindTemplate" />
         <StringDetect String="'''" context="#pop" attribute="WikiTag" />
         <StringDetect String="''" context="BoldUnderlinedItalic" attribute="WikiTag" />
         <IncludeRules context="FindWikiLinkBeingBoldUnderlined" />
       </context>
       <context name="ItalicUnderlined" attribute="ItalicUnderlined" lineEndContext="#pop" >
         <IncludeRules context="FindTemplate" />
         <RegExpr String="&lt;/u *&gt;" context="#pop" attribute="HtmlTag" />
         <StringDetect String="'''" context="ItalicUnderlinedBold" attribute="WikiTag" />
         <IncludeRules context="FindWikiLinkBeingItalicUnderlined" />
       </context>
       <context name="UnderlinedItalic" attribute="ItalicUnderlined" lineEndContext="#pop" >
         <IncludeRules context="FindTemplate" />
         <StringDetect String="''" context="#pop" attribute="WikiTag" />
         <StringDetect String="'''" context="ItalicUnderlinedBold" attribute="WikiTag" />
         <IncludeRules context="FindWikiLinkBeingItalicUnderlined" />
       </context>
       <context name="BoldItalicUnderlined" attribute="BoldItalicUnderlined" lineEndContext="#pop" >
         <IncludeRules context="FindTemplate" />
         <RegExpr String="&lt;/u *&gt;" context="#pop" attribute="HtmlTag" />
         <IncludeRules context="FindWikiLinkBeingBoldItalicUnderlined" />
       </context>
       <context name="BoldUnderlinedItalic" attribute="BoldItalicUnderlined" lineEndContext="#pop" >
         <IncludeRules context="FindTemplate" />
         <StringDetect String="''" context="#pop" attribute="WikiTag" />
         <IncludeRules context="FindWikiLinkBeingBoldItalicUnderlined" />
       </context>
       <context name="ItalicUnderlinedBold" attribute="BoldItalicUnderlined" lineEndContext="#pop" >
         <IncludeRules context="FindTemplate" />
         <StringDetect String="'''" context="#pop" attribute="WikiTag" />
         <IncludeRules context="FindWikiLinkBeingBoldItalicUnderlined" />
       </context>
 
       <!-- Contexts for inclusion. -->
 
       <context name="FindHtmlEntities" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&htmlEntity;" attribute="HtmlEntity" />
       </context>
 
       <context name="FindHtmlStartTagAttributes" attribute="Normal" lineEndContext="#stay">
         <RegExpr attribute="HtmlAttribute" context="HtmlAttribute" String="^&htmlTagName;" />
         <RegExpr attribute="HtmlAttribute" context="HtmlAttribute" String="\s+&htmlTagName;" />
         <RegExpr attribute="Error" context="#stay" String="\S" />
       </context>
 
       <context attribute="Normal" lineEndContext="#stay" name="FindListItem" >
         <RegExpr String="[*#;:\s]*[*#:]+" attribute="WikiTag" context="#stay" column="0" />
       </context>
 
       <context attribute="Normal" lineEndContext="#stay" name="FindSyntaxHighlightingHtmlElement" >
         <RegExpr String="&lt;source(?=\s)" context="SourceStartTag" attribute="HtmlTag" />
         <RegExpr String="&lt;syntaxhighlight(?=\s)" context="SyntaxHighlightStartTag" attribute="HtmlTag" />
       </context>
 
       <context name="FindTable" attribute="Normal" lineEndContext="#stay">
         <Detect2Chars char="{" char1="|" column="0" context="TableHeader"  lookAhead="true" />
       </context>
 
       <context attribute="Normal" lineEndContext="#stay" name="FindTemplate" >
         <Detect2Chars char="{" char1="{" context="Template" attribute="WikiTag" beginRegion="template" />
       </context>
 
       <context name="FindTextDecorations" attribute="Normal" lineEndContext="#stay">
         <StringDetect String="'''" attribute="WikiTag" context="Bold" />
         <StringDetect String="''" attribute="WikiTag" context="Italic" />
         <RegExpr String="&lt;u *&gt;" attribute="HtmlTag" context="Underlined" />
       </context>
       <context attribute="Normal" lineEndContext="#stay" name="FindTextDecorationsInHeader" >
         <StringDetect String="'''" attribute="WikiTag" context="Bold" />
         <StringDetect String="''" attribute="WikiTag" context="BoldItalic" />
       </context>
 
       <context attribute="Normal" lineEndContext="#stay" name="FindUrl" >
         <RegExpr String="\[&url;" attribute="WikiTag" context="DelimitedURL" lookAhead="true" />
         <RegExpr String="&url;" attribute="URL" context="LooseURL" lookAhead="true" />
       </context>
       <context attribute="Normal" lineEndContext="#stay" name="FindUrlWithinTemplate" >
         <RegExpr String="\[&url;" attribute="WikiTag" context="DelimitedURL" lookAhead="true" />
         <RegExpr String="&url;" attribute="URL" context="LooseURLWithinTemplate" lookAhead="true" />
       </context>
 
       <context name="FindWikiLink" attribute="Normal" lineEndContext="#stay">
         <Detect2Chars char="[" char1="[" attribute="WikiTag" context="WikiLink" />
       </context>
       <context name="FindWikiLinkBeingBold" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&wikiLinkWithDescription;" context="WikiLinkBoldWithDescription" lookAhead="true" />
         <RegExpr String="&wikiLinkWithoutDescription;" context="WikiLinkBoldWithoutDescription" lookAhead="true" />
       </context>
       <context name="FindWikiLinkBeingItalic" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&wikiLinkWithDescription;" context="WikiLinkItalicWithDescription" lookAhead="true" />
         <RegExpr String="&wikiLinkWithoutDescription;" context="WikiLinkItalicWithoutDescription" lookAhead="true" />
       </context>
       <context name="FindWikiLinkBeingUnderlined" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&wikiLinkWithDescription;" context="WikiLinkUnderlinedWithDescription" lookAhead="true" />
         <RegExpr String="&wikiLinkWithoutDescription;" context="WikiLinkUnderlinedWithoutDescription" lookAhead="true" />
       </context>
       <context name="FindWikiLinkBeingBoldItalic" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&wikiLinkWithDescription;" context="WikiLinkBoldItalicWithDescription" lookAhead="true" />
         <RegExpr String="&wikiLinkWithoutDescription;" context="WikiLinkBoldItalicWithoutDescription" lookAhead="true" />
       </context>
       <context name="FindWikiLinkBeingBoldUnderlined" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&wikiLinkWithDescription;" context="WikiLinkBoldUnderlinedWithDescription" lookAhead="true" />
         <RegExpr String="&wikiLinkWithoutDescription;" context="WikiLinkBoldUnderlinedWithoutDescription" lookAhead="true" />
       </context>
       <context name="FindWikiLinkBeingItalicUnderlined" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&wikiLinkWithDescription;" context="WikiLinkItalicUnderlinedWithDescription" lookAhead="true" />
         <RegExpr String="&wikiLinkWithoutDescription;" context="WikiLinkItalicUnderlinedWithoutDescription" lookAhead="true" />
       </context>
       <context name="FindWikiLinkBeingBoldItalicUnderlined" attribute="Normal" lineEndContext="#stay">
         <RegExpr String="&wikiLinkWithDescription;" context="WikiLinkBoldItalicUnderlinedWithDescription" lookAhead="true" />
         <RegExpr String="&wikiLinkWithoutDescription;" context="WikiLinkBoldItalicUnderlinedWithoutDescription" lookAhead="true" />
       </context>
 
     </contexts>
     <itemDatas>
       <itemData name="Normal" defStyleNum="dsNormal" />
       <itemData name="Link" defStyleNum="dsOthers" />
       <itemData name="LinkBold" defStyleNum="dsOthers" bold="true" />
       <itemData name="LinkItalic" defStyleNum="dsOthers" italic="true" />
       <itemData name="LinkUnderlined" defStyleNum="dsOthers" underline="true" />
       <itemData name="LinkBoldItalic" defStyleNum="dsOthers" bold="true" italic="true" />
       <itemData name="LinkBoldUnderlined" defStyleNum="dsOthers" bold="true" underline="true" />
       <itemData name="LinkItalicUnderlined" defStyleNum="dsOthers" italic="true" underline="true" />
       <itemData name="LinkBoldItalicUnderlined" defStyleNum="dsOthers" bold="true" italic="true" underline="true" />
       <itemData name="URL" defStyleNum="dsOthers" />
       <itemData name="Comment" defStyleNum="dsComment" />
       <itemData name="Section" defStyleNum="dsKeyword" />
       <itemData name="DefinitionListHeader" defStyleNum="dsKeyword" />
       <itemData name="HtmlEntity" defStyleNum="dsDecVal" />
       <itemData name="HtmlTag" defStyleNum="dsKeyword" />
       <itemData name="WikiTag" defStyleNum="dsDecVal" bold="true" />
       <itemData name="WikiTagBold" defStyleNum="dsDecVal" bold="true" />
       <itemData name="WikiTagItalic" defStyleNum="dsDecVal" bold="true" italic="true" />
       <itemData name="WikiTagUnderlined" defStyleNum="dsDecVal" bold="true" underline="true" />
       <itemData name="WikiTagBoldItalic" defStyleNum="dsDecVal" bold="true" italic="true" />
       <itemData name="WikiTagBoldUnderlined" defStyleNum="dsDecVal" bold="true" underline="true" />
       <itemData name="WikiTagItalicUnderlined" defStyleNum="dsDecVal" bold="true" italic="true" underline="true" />
       <itemData name="WikiTagBoldItalicUnderlined" defStyleNum="dsDecVal" bold="true" italic="true" underline="true" />
       <itemData name="Error" defStyleNum="dsError" />
       <itemData name="NoWiki" defStyleNum="dsNormal" />
       <itemData name="Unformatted" defStyleNum="dsNormal" />
       <itemData name="Parameter" defStyleNum="dsNormal" bold="true" />
       <itemData name="TemplateName" defStyleNum="dsOthers" bold="true" />
       <itemData name="Bold" defStyleNum="dsNormal" bold="true" />
       <itemData name="Italic" defStyleNum="dsNormal" italic="true" />
       <itemData name="Underlined" defStyleNum="dsNormal" underline="true" />
       <itemData name="BoldItalic" defStyleNum="dsNormal" bold="true" italic="true" />
       <itemData name="BoldUnderlined" defStyleNum="dsNormal" bold="true" underline="true" />
       <itemData name="ItalicUnderlined" defStyleNum="dsNormal" italic="true" underline="true" />
       <itemData name="BoldItalicUnderlined" defStyleNum="dsNormal" bold="true" italic="true" underline="true" />
       <itemData name="HtmlAttribute" defStyleNum="dsOthers" spellChecking="false" />
       <itemData name="HtmlValue" defStyleNum="dsString" spellChecking="false" />
     </itemDatas>
   </highlighting>
   <general>
     <comments>
       <comment end="//-->" start="&lt;!--" name="multiLine" />
     </comments>
     <keywords casesensitive="0" />
-    <indentation mode="normal" />
   </general>
 </language>
diff --git a/data/syntax/mel.xml b/data/syntax/mel.xml
index 153dfec..8806852 100644
--- a/data/syntax/mel.xml
+++ b/data/syntax/mel.xml
@@ -1,1381 +1,1380 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!--
   MEL (Maya Embedded Language)
 
   GNU GENERAL PUBLIC LICENCE
 
 This program, including associated files, is free software.  You may
 distribute 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.
 
 This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 -->
 
-<language name="MEL" section="Scripts" version="3" kateversion="2.4" extensions="*.mel" mimetype="" author="Karl Erlandsen (karlerlandsen@yahoo.com)" license="GPLv2+">
+<language name="MEL" section="Scripts" version="4" kateversion="2.4" extensions="*.mel" mimetype="" author="Karl Erlandsen (karlerlandsen@yahoo.com)" license="GPLv2+">
   <highlighting>
     <list name="keywords">
       <item>break</item>
       <item>case</item>
       <item>continue</item>
       <item>default</item>
       <item>do</item>
       <item>else</item>
       <item>false</item>
       <item>for</item>
       <item>global</item>
       <item>if</item>
       <item>in</item>
       <item>proc</item>
       <item>return</item>
       <item>switch</item>
       <item>true</item>
       <item>while</item>
     </list>
     
     <!-- The command list can be automatically generated from the Maya Help Documentation in /usr/aw/maya/docs/Maya*/en_US/Commands
          with the following bash script:
          
          #!/bin/bash
          
          cd /usr/aw/maya/docs/Maya*/en_US/Commands;
          for file in *.html
          do
            echo "      <item>${file%%.html}</item>" >> ~/list.xml;
          done
          
          -->
     <list name="MEL commands">
       <item>about</item>
       <item>abs</item>
       <item>addAttr</item>
       <item>addAttributeEditorNodeHelp</item>
       <item>addDynamic</item>
       <item>addNewShelfTab</item>
       <item>addPanelCategory</item>
       <item>addPP</item>
       <item>addPrefixToName</item>
       <item>advanceToNextDrivenKey</item>
       <item>affectedNet</item>
       <item>affects</item>
       <item>aimConstraint</item>
       <item>air</item>
       <item>aliasAttr</item>
       <item>alias</item>
       <item>alignCtx</item>
       <item>alignCurve</item>
       <item>align</item>
       <item>alignSurface</item>
       <item>allViewFit</item>
       <item>ambientLight</item>
       <item>angleBetween</item>
       <item>angle</item>
       <item>animCurveEditor</item>
       <item>animDisplay</item>
       <item>animView</item>
       <item>annotate</item>
       <item>appendStringArray</item>
       <item>applicationName</item>
       <item>applyAttrPreset</item>
       <item>applyTake</item>
       <item>arcLenDimContext</item>
       <item>arcLengthDimension</item>
       <item>arclen</item>
       <item>arrayMapper</item>
       <item>art3dPaintCtx</item>
       <item>artAttrCtx</item>
       <item>artAttrPaintVertexCtx</item>
       <item>artAttrSkinPaintCtx</item>
       <item>artAttrTool</item>
       <item>artBuildPaintMenu</item>
       <item>artFluidAttrCtx</item>
       <item>artPuttyCtx</item>
       <item>artSelectCtx</item>
       <item>artSetPaintCtx</item>
       <item>artUserPaintCtx</item>
       <item>assignCommand</item>
       <item>assignInputDevice</item>
       <item>assignViewportFactories</item>
       <item>attachCurve</item>
       <item>attachDeviceAttr</item>
       <item>attachSurface</item>
       <item>attrColorSliderGrp</item>
       <item>attrCompatibility</item>
       <item>attrControlGrp</item>
       <item>attrEnumOptionMenuGrp</item>
       <item>attrEnumOptionMenu</item>
       <item>attrFieldGrp</item>
       <item>attrFieldSliderGrp</item>
       <item>attributeExists</item>
       <item>attributeInfo</item>
       <item>attributeMenu</item>
       <item>attributeQuery</item>
       <item>attrNavigationControlGrp</item>
       <item>attrPresetEditWin</item>
       <item>autoKeyframe</item>
       <item>autoPlace</item>
       <item>bakeClip</item>
       <item>bakeFluidShading</item>
       <item>bakePartialHistory</item>
       <item>bakeResults</item>
       <item>bakeSimulation</item>
       <item>basenameEx</item>
       <item>basename</item>
       <item>batchRender</item>
       <item>bessel</item>
       <item>bevel</item>
       <item>bevelPlus</item>
       <item>bindSkin</item>
       <item>binMembership</item>
       <item>blank</item>
       <item>blend2</item>
       <item>blendShapeEditor</item>
       <item>blendShape</item>
       <item>blendShapePanel</item>
       <item>blendTwoAttr</item>
       <item>blindDataType</item>
       <item>boneLattice</item>
       <item>boundary</item>
       <item>boxDollyCtx</item>
       <item>boxZoomCtx</item>
       <item>bufferCurve</item>
       <item>buildBookmarkMenu</item>
       <item>buildKeyframeMenu</item>
       <item>button</item>
       <item>buttonManip</item>
       <item>cacheFileCombine</item>
       <item>cacheFile</item>
       <item>cacheFileMerge</item>
       <item>cacheFileTrack</item>
       <item>camera</item>
       <item>cameraView</item>
       <item>canCreateManip</item>
       <item>canvas</item>
       <item>capitalizeString</item>
       <item>cat_Animation</item>
       <item>catch</item>
       <item>catchQuiet</item>
       <item>cat_Effects</item>
       <item>cat_General</item>
       <item>cat_Language</item>
       <item>cat_Modeling</item>
       <item>cat_Rendering</item>
       <item>cat_System</item>
       <item>cat_Windows</item>
       <item>CBG</item>
       <item>ceil</item>
       <item>changeSubdivComponentDisplayLevel</item>
       <item>changeSubdivRegion</item>
       <item>channelBox</item>
       <item>character</item>
       <item>characterize</item>
       <item>characterMap</item>
       <item>characterOutlineEditor</item>
       <item>chdir</item>
       <item>checkBoxGrp</item>
       <item>checkBox</item>
       <item>checkDefaultRenderGlobals</item>
       <item>choice</item>
       <item>circle</item>
       <item>circularFillet</item>
       <item>clamp</item>
       <item>clearCache</item>
       <item>clear</item>
       <item>clipEditorCurrentTimeCtx</item>
       <item>clipEditor</item>
       <item>clip</item>
       <item>clipSchedule</item>
       <item>clipSchedulerOutliner</item>
       <item>clipTrimBefore</item>
       <item>closeCurve</item>
       <item>closeSurface</item>
       <item>cluster</item>
       <item>cmdFileOutput</item>
       <item>cmdScrollFieldExecuter</item>
       <item>cmdScrollFieldReporter</item>
       <item>cmdShell</item>
       <item>coarsenSubdivSelectionList</item>
       <item>collision</item>
       <item>colorAtPoint</item>
       <item>colorEditor</item>
       <item>color</item>
       <item>colorIndex</item>
       <item>colorIndexSliderGrp</item>
       <item>colorSliderButtonGrp</item>
       <item>colorSliderGrp</item>
       <item>columnLayout</item>
       <item>commandEcho</item>
       <item>commandLine</item>
       <item>commandPort</item>
       <item>compactHairSystem</item>
       <item>componentEditor</item>
       <item>compositingInterop</item>
       <item>computePolysetVolume</item>
       <item>condition</item>
       <item>cone</item>
       <item>confirmDialog</item>
       <item>connectAttr</item>
       <item>connectControl</item>
       <item>connectDynamic</item>
       <item>connectionInfo</item>
       <item>connectJoint</item>
       <item>constrain</item>
       <item>constrainValue</item>
       <item>constructionHistory</item>
       <item>container</item>
       <item>containsMultibyte</item>
       <item>contextInfo</item>
       <item>control</item>
       <item>convertFromOldLayers</item>
       <item>convertIffToPsd</item>
       <item>convertLightmap</item>
       <item>convertSolidTx</item>
       <item>convertTessellation</item>
       <item>convertUnit</item>
       <item>copyArray</item>
       <item>copyFlexor</item>
       <item>copyKey</item>
       <item>copySkinWeights</item>
       <item>cos</item>
       <item>cpButton</item>
       <item>cpCache</item>
       <item>cpClothSet</item>
       <item>cpCollision</item>
       <item>cpConstraint</item>
       <item>cpConvClothToMesh</item>
       <item>cpForces</item>
       <item>cpGetSolverAttr</item>
       <item>cpPanel</item>
       <item>cpProperty</item>
       <item>cpRigidCollisionFilter</item>
       <item>cpSeam</item>
       <item>cpSetEdit</item>
       <item>cpSetSolverAttr</item>
       <item>cpSolver</item>
       <item>cpSolverTypes</item>
       <item>cpTool</item>
       <item>cpUpdateClothUVs</item>
       <item>createDisplayLayer</item>
       <item>createDrawCtx</item>
       <item>createEditor</item>
       <item>createLayeredPsdFile</item>
       <item>createMotionField</item>
       <item>createNewShelf</item>
       <item>createNode</item>
       <item>createRenderLayer</item>
       <item>createSubdivRegion</item>
       <item>cross</item>
       <item>crossProduct</item>
       <item>ctxAbort</item>
       <item>ctxCompletion</item>
       <item>ctxEditMode</item>
       <item>ctxTraverse</item>
       <item>currentCtx</item>
       <item>currentTimeCtx</item>
       <item>currentTime</item>
       <item>currentUnit</item>
       <item>curveAddPtCtx</item>
       <item>curveCVCtx</item>
       <item>curveEditorCtx</item>
       <item>curveEPCtx</item>
       <item>curve</item>
       <item>curveIntersect</item>
       <item>curveMoveEPCtx</item>
       <item>curveOnSurface</item>
       <item>curveSketchCtx</item>
       <item>cutKey</item>
       <item>cycleCheck</item>
       <item>cylinder</item>
       <item>dagPose</item>
       <item>date</item>
       <item>defaultLightListCheckBox</item>
       <item>defaultNavigation</item>
       <item>defineDataServer</item>
       <item>defineVirtualDevice</item>
       <item>deformer</item>
       <item>deg_to_rad</item>
       <item>deleteAttr</item>
       <item>delete</item>
       <item>deleteShadingGroupsAndMaterials</item>
       <item>deleteShelfTab</item>
       <item>deleteUI</item>
       <item>deleteUnusedBrushes</item>
       <item>delrandstr</item>
       <item>detachCurve</item>
       <item>detachDeviceAttr</item>
       <item>detachSurface</item>
       <item>deviceEditor</item>
       <item>devicePanel</item>
       <item>dgdirty</item>
       <item>dgeval</item>
       <item>dgInfo</item>
       <item>dgtimer</item>
       <item>dimWhen</item>
       <item>directionalLight</item>
       <item>directKeyCtx</item>
       <item>dirmap</item>
       <item>dirname</item>
       <item>disable</item>
       <item>disconnectAttr</item>
       <item>disconnectJoint</item>
       <item>diskCache</item>
       <item>displacementToPoly</item>
       <item>displayAffected</item>
       <item>displayColor</item>
       <item>displayCull</item>
       <item>displayLevelOfDetail</item>
       <item>displayPref</item>
       <item>displayRGBColor</item>
       <item>displaySmoothness</item>
       <item>displayStats</item>
       <item>displayString</item>
       <item>displaySurface</item>
       <item>distanceDimContext</item>
       <item>distanceDimension</item>
       <item>doBlur</item>
       <item>dollyCtx</item>
       <item>dolly</item>
       <item>dopeSheetEditor</item>
       <item>dot</item>
       <item>dotProduct</item>
       <item>doubleProfileBirailSurface</item>
       <item>dragAttrContext</item>
       <item>draggerContext</item>
       <item>drag</item>
       <item>dropoffLocator</item>
       <item>duplicateCurve</item>
       <item>duplicate</item>
       <item>duplicateSurface</item>
       <item>dynamicLoad</item>
       <item>dynCache</item>
       <item>dynControl</item>
       <item>dynExport</item>
       <item>dynExpression</item>
       <item>dynGlobals</item>
       <item>dynPaintEditor</item>
       <item>dynParticleCtx</item>
       <item>dynPref</item>
       <item>dynRelEditor</item>
       <item>dynRelEdPanel</item>
       <item>editAttrLimits</item>
       <item>editDisplayLayerGlobals</item>
       <item>editDisplayLayerMembers</item>
       <item>editor</item>
       <item>editorTemplate</item>
       <item>editRenderLayerAdjustment</item>
       <item>editRenderLayerGlobals</item>
       <item>editRenderLayerMembers</item>
       <item>effector</item>
       <item>emit</item>
       <item>emitter</item>
       <item>enableDevice</item>
       <item>encodeString</item>
       <item>endString</item>
       <item>endsWith</item>
       <item>env</item>
       <item>equivalent</item>
       <item>equivalentTol</item>
       <item>erf</item>
       <item>error</item>
       <item>evalDeferred</item>
       <item>evalEcho</item>
       <item>eval</item>
       <item>event</item>
       <item>exactWorldBoundingBox</item>
       <item>exclusiveLightCheckBox</item>
       <item>exec</item>
       <item>executeForEachObject</item>
       <item>exists</item>
       <item>exp</item>
       <item>expressionEditorListen</item>
       <item>expression</item>
       <item>extendCurve</item>
       <item>extendSurface</item>
       <item>extrude</item>
       <item>fcheck</item>
       <item>fclose</item>
       <item>feof</item>
       <item>fflush</item>
       <item>fgetline</item>
       <item>fgetword</item>
       <item>fileBrowserDialog</item>
       <item>fileDialog</item>
       <item>fileExtension</item>
       <item>file</item>
       <item>fileInfo</item>
       <item>filetest</item>
       <item>filletCurve</item>
       <item>filterCurve</item>
       <item>filterExpand</item>
       <item>filter</item>
       <item>filterStudioImport</item>
       <item>findAllIntersections</item>
       <item>findAnimCurves</item>
       <item>finder</item>
       <item>findKeyframe</item>
       <item>findMenuItem</item>
       <item>findRelatedSkinCluster</item>
       <item>firstParentOf</item>
       <item>fitBspline</item>
       <item>flexor</item>
       <item>floatEq</item>
       <item>floatFieldGrp</item>
       <item>floatField</item>
       <item>floatScrollBar</item>
       <item>floatSlider2</item>
       <item>floatSliderButtonGrp</item>
       <item>floatSliderGrp</item>
       <item>floatSlider</item>
       <item>floor</item>
       <item>flow</item>
       <item>fluidCacheInfo</item>
       <item>fluidEmitter</item>
       <item>fluidVoxelInfo</item>
       <item>flushUndo</item>
       <item>fmod</item>
       <item>fontDialog</item>
       <item>fopen</item>
       <item>format</item>
       <item>formLayout</item>
       <item>fprint</item>
       <item>frameLayout</item>
       <item>frame_search</item>
       <item>fread</item>
       <item>freeFormFillet</item>
       <item>frewind</item>
       <item>fromNativePath</item>
       <item>fwrite</item>
       <item>gamma</item>
       <item>gauss</item>
       <item>geometryConstraint</item>
       <item>getApplicationVersionAsFloat</item>
       <item>getAttr</item>
       <item>getClassification</item>
       <item>getDefaultBrush</item>
       <item>getenv</item>
       <item>getFileList</item>
       <item>getFluidAttr</item>
       <item>getInputDeviceRange</item>
       <item>getMayaPanelTypes</item>
       <item>getModifiers</item>
       <item>getPanel</item>
       <item>getParticleAttr</item>
       <item>getpid</item>
       <item>getPluginResource</item>
       <item>globalStitch</item>
       <item>glRenderEditor</item>
       <item>glRender</item>
       <item>gmatch</item>
       <item>goal</item>
       <item>gotoBindPose</item>
       <item>grabColor</item>
       <item>gradientControl</item>
       <item>gradientControlNoAttr</item>
       <item>graphDollyCtx</item>
       <item>graphSelectContext</item>
       <item>graphTrackCtx</item>
       <item>gravity</item>
       <item>grid</item>
       <item>gridLayout</item>
       <item>group</item>
       <item>groupObjectsByName</item>
       <item>hardenPointCurve</item>
       <item>hardware</item>
       <item>hardwareRenderPanel</item>
       <item>headsUpDisplay</item>
       <item>headsUpMessage</item>
       <item>help</item>
       <item>helpLine</item>
       <item>hermite</item>
       <item>HfAddAttractorToAS</item>
       <item>HfAssignAS</item>
       <item>HfBuildEqualMap</item>
       <item>HfBuildFurFiles</item>
       <item>HfBuildFurImages</item>
       <item>HfCancelAFR</item>
       <item>HfConnectASToHF</item>
       <item>HfCreateAttractor</item>
       <item>HfDeleteAS</item>
       <item>HfEditAS</item>
       <item>HfPerformCreateAS</item>
       <item>HfRemoveAttractorFromAS</item>
       <item>HfSelectAttached</item>
       <item>HfSelectAttractors</item>
       <item>HfUnassignAS</item>
       <item>hide</item>
       <item>hilite</item>
       <item>hitTest</item>
       <item>hotBox</item>
       <item>hotkeyCheck</item>
       <item>hotkey</item>
       <item>hsv_to_rgb</item>
       <item>hudButton</item>
       <item>hudSliderButton</item>
       <item>hudSlider</item>
       <item>hwReflectionMap</item>
       <item>hwRender</item>
       <item>hwRenderLoad</item>
       <item>hyperGraph</item>
       <item>hyperPanel</item>
       <item>hyperShade</item>
       <item>hypot</item>
       <item>iconTextButton</item>
       <item>iconTextCheckBox</item>
       <item>iconTextRadioButton</item>
       <item>iconTextRadioCollection</item>
       <item>iconTextScrollList</item>
       <item>iconTextStaticLabel</item>
       <item>ikfkDisplayMethod</item>
       <item>ikHandleCtx</item>
       <item>ikHandleDisplayScale</item>
       <item>ikHandle</item>
       <item>ikSolver</item>
       <item>ikSplineHandleCtx</item>
       <item>ikSystem</item>
       <item>ikSystemInfo</item>
       <item>illustratorCurves</item>
       <item>image</item>
       <item>imfPlugins</item>
       <item>index_all</item>
       <item>index</item>
       <item>index_overview</item>
       <item>index_substring</item>
       <item>inheritTransform</item>
       <item>insertJointCtx</item>
       <item>insertJoint</item>
       <item>insertKeyCtx</item>
       <item>insertKnotCurve</item>
       <item>insertKnotSurface</item>
       <item>instanceable</item>
       <item>instance</item>
       <item>instancer</item>
       <item>internalVar</item>
       <item>intersect</item>
       <item>interToUI</item>
       <item>intFieldGrp</item>
       <item>intField</item>
       <item>intScrollBar</item>
       <item>intSliderGrp</item>
       <item>intSlider</item>
       <item>iprEngine</item>
       <item>isAnimCurve</item>
       <item>isConnected</item>
       <item>isDirty</item>
       <item>isolateSelect</item>
       <item>isParentOf</item>
       <item>isSameObject</item>
       <item>isTrue</item>
       <item>isValidObjectName</item>
       <item>isValidString</item>
       <item>isValidUiName</item>
       <item>itemFilterAttr</item>
       <item>itemFilter</item>
       <item>itemFilterRender</item>
       <item>itemFilterType</item>
       <item>jointCluster</item>
       <item>jointCtx</item>
       <item>jointDisplayScale</item>
       <item>joint</item>
       <item>jointLattice</item>
       <item>keyframe</item>
       <item>keyframeOutliner</item>
       <item>keyframeRegionCurrentTimeCtx</item>
       <item>keyframeRegionDirectKeyCtx</item>
       <item>keyframeRegionDollyCtx</item>
       <item>keyframeRegionInsertKeyCtx</item>
       <item>keyframeRegionMoveKeyCtx</item>
       <item>keyframeRegionScaleKeyCtx</item>
       <item>keyframeRegionSelectKeyCtx</item>
       <item>keyframeRegionSetKeyCtx</item>
       <item>keyframeRegionTrackCtx</item>
       <item>keyframeStats</item>
       <item>keyTangent</item>
       <item>lassoContext</item>
       <item>latticeDeformKeyCtx</item>
       <item>lattice</item>
       <item>launch</item>
       <item>launchImageEditor</item>
       <item>layerButton</item>
       <item>layeredShaderPort</item>
       <item>layeredTexturePort</item>
       <item>layoutDialog</item>
       <item>layout</item>
       <item>lightlink</item>
       <item>lightListEditor</item>
       <item>lightList</item>
       <item>lightListPanel</item>
       <item>linearPrecision</item>
       <item>lineIntersection</item>
       <item>linstep</item>
       <item>listAnimatable</item>
       <item>listAttr</item>
       <item>listCameras</item>
       <item>listConnections</item>
       <item>listDeviceAttachments</item>
       <item>listerEditor</item>
       <item>listHistory</item>
       <item>listInputDeviceAxes</item>
       <item>listInputDeviceButtons</item>
       <item>listInputDevices</item>
       <item>listMenuAnnotation</item>
       <item>listNodeTypes</item>
       <item>listPanelCategories</item>
       <item>listRelatives</item>
       <item>listSets</item>
       <item>listTransforms</item>
       <item>listUnselected</item>
       <item>loadFluid</item>
       <item>loadNewShelf</item>
       <item>loadPlugin</item>
       <item>loadPluginLanguageResources</item>
       <item>loadPrefObjects</item>
       <item>localizedPanelLabel</item>
       <item>lockNode</item>
       <item>loft</item>
       <item>log</item>
       <item>longNameOf</item>
       <item>lookThru</item>
       <item>ls</item>
       <item>lsThroughFilter</item>
       <item>lsType</item>
       <item>lsUI</item>
       <item>mag</item>
       <item>makebot</item>
       <item>makeIdentity</item>
       <item>makeLive</item>
       <item>makePaintable</item>
       <item>makeRoll</item>
       <item>makeSingleSurface</item>
       <item>makeTubeOn</item>
       <item>manipMoveContext</item>
       <item>manipMoveLimitsCtx</item>
       <item>manipOptions</item>
       <item>manipRotateContext</item>
       <item>manipRotateLimitsCtx</item>
       <item>manipScaleContext</item>
       <item>manipScaleLimitsCtx</item>
       <item>marker</item>
       <item>match</item>
       <item>max</item>
       <item>Mayatomr</item>
       <item>memory</item>
       <item>menuBarLayout</item>
       <item>menuEditor</item>
       <item>menu</item>
       <item>menuItem</item>
       <item>menuItemToShelf</item>
       <item>menuSet</item>
       <item>menuSetPref</item>
       <item>messageLine</item>
       <item>min</item>
       <item>minimizeApp</item>
       <item>mirrorJoint</item>
       <item>modelCurrentTimeCtx</item>
       <item>modelEditor</item>
       <item>modelPanel</item>
       <item>mouse</item>
       <item>move</item>
       <item>moveIKtoFK</item>
       <item>moveKeyCtx</item>
       <item>moveVertexAlongDirection</item>
       <item>movIn</item>
       <item>movOut</item>
       <item>multiProfileBirailSurface</item>
       <item>mute</item>
       <item>nameCommand</item>
       <item>nameField</item>
       <item>namespace</item>
       <item>namespaceInfo</item>
       <item>nav_Animation</item>
       <item>nav_Effects</item>
       <item>nav_General</item>
       <item>nav_Language</item>
       <item>nav_Modeling</item>
       <item>nav_Rendering</item>
       <item>nav_System</item>
       <item>nav_Windows</item>
       <item>newPanelItems</item>
       <item>newton</item>
       <item>nodeCast</item>
       <item>nodeIconButton</item>
       <item>nodeOutliner</item>
       <item>nodePreset</item>
       <item>nodeType</item>
       <item>noise</item>
       <item>nonLinear</item>
       <item>normalConstraint</item>
       <item>normalize</item>
       <item>nParticle</item>
       <item>nurbsBoolean</item>
       <item>nurbsCopyUVSet</item>
       <item>nurbsCube</item>
       <item>nurbsEditUV</item>
       <item>nurbsPlane</item>
       <item>nurbsSelect</item>
       <item>nurbsSquare</item>
       <item>nurbsToPolygonsPref</item>
       <item>nurbsToPoly</item>
       <item>nurbsToSubdiv</item>
       <item>nurbsToSubdivPref</item>
       <item>nurbsUVSet</item>
       <item>nurbsViewDirectionVector</item>
       <item>objectCenter</item>
       <item>objectLayer</item>
       <item>objectType</item>
       <item>objectTypeUI</item>
       <item>objExists</item>
       <item>obsoleteProc</item>
       <item>oceanNurbsPreviewPlane</item>
       <item>offsetCurve</item>
       <item>offsetCurveOnSurface</item>
       <item>offsetSurface</item>
       <item>openGLExtension</item>
       <item>openMayaPref</item>
       <item>optionMenuGrp</item>
       <item>optionMenu</item>
       <item>optionVar</item>
       <item>orbitCtx</item>
       <item>orbit</item>
       <item>orientConstraint</item>
       <item>outlinerEditor</item>
       <item>outlinerPanel</item>
       <item>overrideModifier</item>
       <item>paintEffectsDisplay</item>
       <item>pairBlend</item>
       <item>palettePort</item>
       <item>paneLayout</item>
       <item>panelConfiguration</item>
       <item>panelHistory</item>
       <item>panel</item>
       <item>paramDimContext</item>
       <item>paramDimension</item>
       <item>paramLocator</item>
       <item>parentConstraint</item>
       <item>parent</item>
       <item>particleExists</item>
       <item>particle</item>
       <item>particleInstancer</item>
       <item>particleRenderInfo</item>
       <item>partition</item>
       <item>pasteKey</item>
       <item>pathAnimation</item>
       <item>pause</item>
       <item>pclose</item>
       <item>percent</item>
       <item>performanceOptions</item>
       <item>pfxstrokes</item>
       <item>pickWalk</item>
       <item>picture</item>
       <item>pixelMove</item>
       <item>planarSrf</item>
       <item>plane</item>
       <item>playbackOptions</item>
       <item>playblast</item>
       <item>play</item>
       <item>plugAttr</item>
       <item>pluginInfo</item>
       <item>pluginResourceUtil</item>
       <item>plugNode</item>
       <item>pointConstraint</item>
       <item>pointCurveConstraint</item>
       <item>pointLight</item>
       <item>pointMatrixMult</item>
       <item>pointOnCurve</item>
       <item>pointOnSurface</item>
       <item>pointPosition</item>
       <item>poleVectorConstraint</item>
       <item>polyAppendFacetCtx</item>
       <item>polyAppend</item>
       <item>polyAppendVertex</item>
       <item>polyAutoProjection</item>
       <item>polyAverageNormal</item>
       <item>polyAverageVertex</item>
       <item>polyBevel</item>
       <item>polyBlendColor</item>
       <item>polyBlindData</item>
       <item>polyBoolOp</item>
       <item>polyBridgeEdge</item>
       <item>polyCacheMonitor</item>
       <item>polyCheck</item>
       <item>polyChipOff</item>
       <item>polyClipboard</item>
       <item>polyCloseBorder</item>
       <item>polyCollapseEdge</item>
       <item>polyCollapseFacet</item>
       <item>polyColorBlindData</item>
       <item>polyColorDel</item>
       <item>polyColorPerVertex</item>
       <item>polyColorSet</item>
       <item>polyCompare</item>
       <item>polyCone</item>
       <item>polyCopyUV</item>
       <item>polyCreaseCtx</item>
       <item>polyCrease</item>
       <item>polyCreateFacetCtx</item>
       <item>polyCreateFacet</item>
       <item>polyCube</item>
       <item>polyCutCtx</item>
       <item>polyCut</item>
       <item>polyCylinder</item>
       <item>polyCylindricalProjection</item>
       <item>polyDelEdge</item>
       <item>polyDelFacet</item>
       <item>polyDelVertex</item>
       <item>polyDuplicateAndConnect</item>
       <item>polyDuplicateEdge</item>
       <item>polyEditUV</item>
       <item>polyEditUVShell</item>
       <item>polyEvaluate</item>
       <item>polyExtrudeEdge</item>
       <item>polyExtrudeFacet</item>
       <item>polyExtrudeVertex</item>
       <item>polyFlipEdge</item>
       <item>polyFlipUV</item>
       <item>polyForceUV</item>
       <item>polyGeoSampler</item>
       <item>polyHelix</item>
       <item>polyInfo</item>
       <item>polyInstallAction</item>
       <item>polyLayoutUV</item>
       <item>polyListComponentConversion</item>
       <item>polyMapCut</item>
       <item>polyMapDel</item>
       <item>polyMapSew</item>
       <item>polyMapSewMove</item>
       <item>polyMergeEdgeCtx</item>
       <item>polyMergeEdge</item>
       <item>polyMergeFacetCtx</item>
       <item>polyMergeFacet</item>
       <item>polyMergeUV</item>
       <item>polyMergeVertex</item>
       <item>polyMirrorFace</item>
       <item>polyMoveEdge</item>
       <item>polyMoveFacet</item>
       <item>polyMoveFacetUV</item>
       <item>polyMoveUV</item>
       <item>polyMoveVertex</item>
       <item>polyNormal</item>
       <item>polyNormalizeUV</item>
       <item>polyNormalPerVertex</item>
       <item>polyOptions</item>
       <item>polyOptUvs</item>
       <item>polyOutput</item>
       <item>polyPipe</item>
       <item>polyPlanarProjection</item>
       <item>polyPlane</item>
       <item>polyPlatonicSolid</item>
       <item>polyPoke</item>
       <item>polyPrimitive</item>
       <item>polyPrism</item>
       <item>polyProjection</item>
       <item>polyPyramid</item>
       <item>polyQuad</item>
       <item>polyQueryBlindData</item>
       <item>polyReduce</item>
       <item>polySelectConstraint</item>
       <item>polySelectConstraintMonitor</item>
       <item>polySelectCtx</item>
       <item>polySelectEditCtx</item>
       <item>polySelect</item>
       <item>polySeparate</item>
       <item>polySetToFaceNormal</item>
       <item>polySewEdge</item>
       <item>polyShortestPathCtx</item>
       <item>polySlideEdge</item>
       <item>polySmooth</item>
       <item>polySoftEdge</item>
       <item>polySphere</item>
       <item>polySphericalProjection</item>
       <item>polySplitCtx</item>
       <item>polySplitEdge</item>
       <item>polySplit</item>
       <item>polySplitRing</item>
       <item>polySplitVertex</item>
       <item>polyStraightenUVBorder</item>
       <item>polySubdivideEdge</item>
       <item>polySubdivideFacet</item>
       <item>polyTorus</item>
       <item>polyToSubdiv</item>
       <item>polyTransfer</item>
       <item>polyTriangulate</item>
       <item>polyUnite</item>
       <item>polyUVSet</item>
       <item>polyWedgeFace</item>
       <item>popen</item>
       <item>popupMenu</item>
       <item>pose</item>
       <item>pow</item>
       <item>preloadRefEd</item>
       <item>print</item>
       <item>progressBar</item>
       <item>progressWindow</item>
       <item>projectCurve</item>
       <item>projectionContext</item>
       <item>projectionManip</item>
       <item>projectTangent</item>
       <item>projFileViewer</item>
       <item>promptDialog</item>
       <item>propModCtx</item>
       <item>propMove</item>
       <item>psdChannelOutliner</item>
       <item>psdEditTextureFile</item>
       <item>psdExport</item>
       <item>psdTextureFile</item>
       <item>putenv</item>
       <item>pwd</item>
       <item>python</item>
       <item>querySubdiv</item>
       <item>quit</item>
       <item>radial</item>
       <item>radioButtonGrp</item>
       <item>radioButton</item>
       <item>radioCollection</item>
       <item>radioMenuItemCollection</item>
       <item>rad_to_deg</item>
       <item>rampColorPort</item>
       <item>rand</item>
       <item>randomizeFollicles</item>
       <item>randstate</item>
       <item>rangeControl</item>
       <item>readTake</item>
       <item>rebuildCurve</item>
       <item>rebuildSurface</item>
       <item>recordAttr</item>
       <item>recordDevice</item>
       <item>redo</item>
       <item>referenceEdit</item>
       <item>reference</item>
       <item>referenceQuery</item>
       <item>refineSubdivSelectionList</item>
       <item>refreshAE</item>
       <item>refresh</item>
       <item>registerPluginResource</item>
       <item>rehash</item>
       <item>reloadImage</item>
       <item>removeJoint</item>
       <item>removeMultiInstance</item>
       <item>removePanelCategory</item>
       <item>renameAttr</item>
       <item>rename</item>
       <item>renameSelectionList</item>
       <item>renameUI</item>
       <item>renderer</item>
       <item>renderGlobalsNode</item>
       <item>render</item>
       <item>renderInfo</item>
       <item>renderLayerButton</item>
       <item>renderLayerParent</item>
       <item>renderLayerPostProcess</item>
       <item>renderLayerUnparent</item>
       <item>renderManip</item>
       <item>renderPartition</item>
       <item>renderQualityNode</item>
       <item>renderSettings</item>
       <item>renderThumbnailUpdate</item>
       <item>renderWindowEditor</item>
       <item>renderWindowSelectContext</item>
       <item>reorderDeformers</item>
       <item>reorder</item>
       <item>requires</item>
       <item>reroot</item>
       <item>resampleFluid</item>
       <item>resetAE</item>
       <item>resetPfxToPolyCamera</item>
       <item>resetTool</item>
       <item>resolutionNode</item>
       <item>retarget</item>
       <item>reverseCurve</item>
       <item>reverseSurface</item>
       <item>revolve</item>
       <item>rgb_to_hsv</item>
       <item>rigidBody</item>
       <item>rigidSolver</item>
       <item>rollCtx</item>
       <item>roll</item>
       <item>rootOf</item>
       <item>rotate</item>
       <item>rotationInterpolation</item>
       <item>rot</item>
       <item>roundConstantRadius</item>
       <item>rowColumnLayout</item>
       <item>rowLayout</item>
       <item>runTimeCommand</item>
       <item>runup</item>
       <item>sampleImage</item>
       <item>saveAllShelves</item>
       <item>saveAttrPreset</item>
       <item>saveFluid</item>
       <item>saveImage</item>
       <item>saveInitialState</item>
       <item>saveMenu</item>
       <item>savePrefObjects</item>
       <item>savePrefs</item>
       <item>saveShelf</item>
       <item>saveToolSettings</item>
       <item>scaleBrushBrightness</item>
       <item>scaleComponents</item>
       <item>scaleConstraint</item>
       <item>scale</item>
       <item>scaleKeyCtx</item>
       <item>scaleKey</item>
       <item>sceneEditor</item>
       <item>sceneUIReplacement</item>
       <item>scmh</item>
       <item>scriptCtx</item>
       <item>scriptEditorInfo</item>
       <item>scriptedPanel</item>
       <item>scriptedPanelType</item>
       <item>scriptJob</item>
       <item>scriptNode</item>
       <item>scriptTable</item>
       <item>scriptToShelf</item>
       <item>scrollField</item>
       <item>scrollLayout</item>
       <item>sculpt</item>
       <item>searchPathArray</item>
       <item>seed</item>
       <item>selectContext</item>
       <item>selectCurveCV</item>
       <item>selectedNodes</item>
       <item>select</item>
       <item>selectionConnection</item>
       <item>selectKeyCtx</item>
       <item>selectKeyframeRegionCtx</item>
       <item>selectKey</item>
       <item>selectMode</item>
       <item>selectPref</item>
       <item>selectPriority</item>
       <item>selectType</item>
       <item>selLoadSettings</item>
       <item>separator</item>
       <item>setAttrEnumResource</item>
       <item>setAttr</item>
       <item>setAttrMapping</item>
       <item>setAttrNiceNameResource</item>
       <item>setConstraintRestPosition</item>
       <item>setCustomAttrEnumResource</item>
       <item>setCustomAttrNiceNameResource</item>
       <item>setDefaultShadingGroup</item>
       <item>setDrivenKeyframe</item>
       <item>setDynamic</item>
       <item>setEditCtx</item>
       <item>setEditor</item>
       <item>setFluidAttr</item>
       <item>setFocus</item>
       <item>setInfinity</item>
       <item>setInputDeviceMapping</item>
       <item>setKeyCtx</item>
       <item>setKeyframeBlendshapeTargetWts</item>
       <item>setKeyframe</item>
       <item>setKeyPath</item>
       <item>setMenuMode</item>
       <item>setNodeNiceNameResource</item>
       <item>setNodeTypeFlag</item>
       <item>setParent</item>
       <item>setParticleAttr</item>
       <item>setPfxToPolyCamera</item>
       <item>setPluginResource</item>
       <item>setProject</item>
       <item>sets</item>
       <item>setStampDensity</item>
       <item>setStartupMessage</item>
       <item>setState</item>
       <item>setToolTo</item>
       <item>setUITemplate</item>
       <item>setXformManip</item>
       <item>shadingConnection</item>
       <item>shadingGeometryRelCtx</item>
       <item>shadingLightRelCtx</item>
       <item>shadingNetworkCompare</item>
       <item>shadingNode</item>
       <item>shapeCompare</item>
       <item>shelfButton</item>
       <item>shelfLayout</item>
       <item>shelfTabLayout</item>
       <item>shellField</item>
       <item>shortNameOf</item>
       <item>showHelp</item>
       <item>showHidden</item>
       <item>show</item>
       <item>showManipCtx</item>
       <item>showSelectionInTitle</item>
       <item>showShadingGroupAttrEditor</item>
       <item>showWindow</item>
       <item>sign</item>
       <item>simplify</item>
       <item>singleProfileBirailSurface</item>
       <item>sin</item>
       <item>sizeBytes</item>
       <item>size</item>
       <item>skinCluster</item>
       <item>skinPercent</item>
       <item>smoothCurve</item>
       <item>smoothstep</item>
       <item>smoothTangentSurface</item>
       <item>snap2to2</item>
       <item>snapKey</item>
       <item>snapMode</item>
       <item>snapshot</item>
       <item>snapTogetherCtx</item>
       <item>soft</item>
       <item>softModCtx</item>
       <item>softMod</item>
       <item>sort</item>
       <item>soundControl</item>
       <item>sound</item>
       <item>source</item>
       <item>spaceLocator</item>
       <item>sphere</item>
       <item>sphrand</item>
       <item>spotLight</item>
       <item>spotLightPreviewPort</item>
       <item>spreadSheetEditor</item>
       <item>spring</item>
       <item>sqrt</item>
       <item>squareSurface</item>
       <item>srtContext</item>
       <item>stackTrace</item>
       <item>startString</item>
       <item>startsWith</item>
       <item>stitchAndExplodeShell</item>
       <item>stitchSurface</item>
       <item>stitchSurfacePoints</item>
       <item>strcmp</item>
       <item>stringArrayCatenate</item>
       <item>stringArrayContains</item>
       <item>stringArrayCount</item>
       <item>stringArrayInsertAtIndex</item>
       <item>stringArrayIntersector</item>
       <item>stringArrayRemoveAtIndex</item>
       <item>stringArrayRemoveDuplicates</item>
       <item>stringArrayRemoveExact</item>
       <item>stringArrayRemove</item>
       <item>stringArrayToString</item>
       <item>stringToStringArray</item>
       <item>strip</item>
       <item>stripPrefixFromName</item>
       <item>stroke</item>
       <item>subdAutoProjection</item>
       <item>subdCleanTopology</item>
       <item>subdCollapse</item>
       <item>subdDuplicateAndConnect</item>
       <item>subdEditUV</item>
       <item>subdivCrease</item>
       <item>subdivDisplaySmoothness</item>
       <item>subdiv</item>
       <item>subdListComponentConversion</item>
       <item>subdMapCut</item>
       <item>subdMapSewMove</item>
       <item>subdMatchTopology</item>
       <item>subdMirror</item>
       <item>subdToBlind</item>
       <item>subdToPoly</item>
       <item>subdTransferUVsToCache</item>
       <item>substituteAllString</item>
       <item>substituteGeometry</item>
       <item>substitute</item>
       <item>substring</item>
       <item>surface</item>
       <item>surfaceSampler</item>
       <item>surfaceShaderList</item>
       <item>swatchDisplayPort</item>
       <item>switchTable</item>
       <item>SymbolsButton</item>
       <item>SymbolsCheckBox</item>
       <item>symmetricModelling</item>
       <item>sysFile</item>
       <item>system</item>
       <item>tabLayout</item>
       <item>tangentConstraint</item>
       <item>tan</item>
       <item>texLatticeDeformContext</item>
       <item>texManipContext</item>
       <item>texMoveContext</item>
       <item>texMoveUVShellContext</item>
       <item>texRotateContext</item>
       <item>texScaleContext</item>
       <item>texSelectContext</item>
       <item>texSelectShortestPathCtx</item>
       <item>texSmudgeUVContext</item>
       <item>textCurves</item>
       <item>textFieldButtonGrp</item>
       <item>textFieldGrp</item>
       <item>textField</item>
       <item>text</item>
       <item>textManip</item>
       <item>textScrollList</item>
       <item>textToShelf</item>
       <item>textureDisplacePlane</item>
       <item>textureHairColor</item>
       <item>texturePlacementContext</item>
       <item>textureWindow</item>
       <item>texWinToolCtx</item>
       <item>threadCount</item>
       <item>threePointArcCtx</item>
       <item>timeControl</item>
       <item>timePort</item>
       <item>timerX</item>
       <item>toggleAxis</item>
       <item>toggle</item>
       <item>toggleWindowVisibility</item>
       <item>tokenize</item>
       <item>tokenizeList</item>
       <item>tolerance</item>
       <item>tolower</item>
       <item>toNativePath</item>
       <item>toolButton</item>
       <item>toolCollection</item>
       <item>toolDropped</item>
       <item>toolHasOptions</item>
       <item>toolPropertyWindow</item>
       <item>torus</item>
       <item>toupper</item>
       <item>trace</item>
       <item>trackCtx</item>
       <item>track</item>
       <item>transferAttributes</item>
       <item>transformCompare</item>
       <item>transformLimits</item>
       <item>translator</item>
       <item>trim</item>
       <item>truncateFluidCache</item>
       <item>truncateHairCache</item>
       <item>trunc</item>
       <item>tumbleCtx</item>
       <item>tumble</item>
       <item>turbulence</item>
       <item>twoPointArcCtx</item>
       <item>uiRes</item>
       <item>uiTemplate</item>
       <item>unassignInputDevice</item>
       <item>undo</item>
       <item>undoInfo</item>
       <item>ungroup</item>
       <item>uniform</item>
       <item>unit</item>
       <item>unloadPlugin</item>
       <item>untangleUV</item>
       <item>untitledFileName</item>
       <item>untrim</item>
       <item>upAxis</item>
       <item>updateAE</item>
       <item>userCtx</item>
       <item>uvLink</item>
       <item>uvSnapshot</item>
       <item>validateShelfName</item>
       <item>vectorize</item>
       <item>view2dToolCtx</item>
       <item>viewCamera</item>
       <item>viewClipPlane</item>
       <item>viewFit</item>
       <item>viewHeadOn</item>
       <item>viewLookAt</item>
       <item>viewManip</item>
       <item>viewPlace</item>
       <item>viewSet</item>
       <item>visor</item>
       <item>volumeAxis</item>
       <item>vortex</item>
       <item>waitCursor</item>
       <item>warning</item>
       <item>webBrowser</item>
       <item>webBrowserPrefs</item>
       <item>whatIs</item>
       <item>window</item>
       <item>windowPref</item>
       <item>wireContext</item>
       <item>wire</item>
       <item>workspace</item>
       <item>wrinkleContext</item>
       <item>wrinkle</item>
       <item>writeTake</item>
       <item>xbmLangPathList</item>
       <item>xform</item>
       <item>xpmPicker</item>
     </list>
     <list name="datatypes">
       <item>int</item>
       <item>string</item>
       <item>float</item>
       <item>vector</item>
       <item>matrix</item>
     </list>
     
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal" >
         <DetectSpaces />
         <Detect2Chars attribute="Block comments" context="Block comments" char="/" char1="*" beginRegion="Block comments" />
         <Detect2Chars attribute="Line comments" context="Line comments" char="/" char1="/" />
         <DetectChar   attribute="Variable names" context="Variable names" char="$" />
         <keyword      attribute="MEL commands" context="#stay" String="MEL commands" />
         <keyword      attribute="Data types" context="#stay" String="datatypes" />
         <keyword      attribute="Keywords" context="#stay" String="keywords" />
         <DetectChar   attribute="Expressions"   context="Expressions" char="`" />
         <DetectChar   attribute="Strings" context="Strings" char="&quot;"/>
         <DetectChar   attribute="Operators" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar   attribute="Operators" context="#stay" char="}" endRegion="Brace1" />
         <AnyChar      attribute="Operators" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;"/>
         <Float        attribute="Float values" context="#stay" />
         <Int          attribute="Integer values" context="#stay" />
       </context>
       
       <context attribute="Block comments" lineEndContext="#stay" name="Block comments">
         <LineContinue attribute="Strings" context="#stay"/>
         <Detect2Chars attribute="Block comments" context="#pop" char="*" char1="/" endRegion="Block comments" />
       </context>
       
       <context attribute="Line comments" lineEndContext="#pop" name="Line comments" />
       
       <context attribute="Strings" lineEndContext="#stay" name="Strings">
         <LineContinue attribute="Strings" context="#stay"/>
         <HlCStringChar attribute="Strings" context="#stay"/>
         <DetectChar attribute="Strings" context="#pop" char="&quot;"/>
       </context>
       
       <context attribute="Expressions" lineEndContext="#stay" name="Expressions">
         <LineContinue attribute="Strings" context="#stay"/>
         <DetectChar attribute="Expressions" context="#pop" char="`" />
       </context>
       
       <context attribute="Variable names" lineEndContext="#pop" name="Variable names">
         <AnyChar attribute="Normal Text" context="#pop" String=" :!%&amp;()+,-/.*&lt;=&gt;?[]{|}~^&#59;" />
         <DetectChar attribute="Expressions" context="Expressions" char="`" />
       </context>
     </contexts>
 
     <itemDatas>
       <itemData name="Normal Text"    defStyleNum="dsNormal" />
       <itemData name="MEL commands"   defStyleNum="dsFunction" />
       <itemData name="Data types"     defStyleNum="dsDataType" />
       <itemData name="Variable names" defStyleNum="dsBaseN" />
       <itemData name="Integer values" defStyleNum="dsDecVal"/>
       <itemData name="Float values"   defStyleNum="dsFloat"/>
       <itemData name="Strings"        defStyleNum="dsString" />
       <itemData name="Operators"      defStyleNum="dsNormal" />
       <itemData name="Keywords"       defStyleNum="dsKeyword" />
       <itemData name="Expressions"    defStyleNum="dsOthers" />
       <itemData name="Block comments" defStyleNum="dsComment" />
       <itemData name="Line comments"  defStyleNum="dsComment" />
     </itemDatas>
   </highlighting>
   
   <general>
     <folding indentationsensitive="false" />
-    <indentation mode="normal" />
     <keywords casesensitive="1" />
     <comments>
       <comment name="singleLine" start="//" />
       <comment name="multiLine"  start="/*" end="*/" region="Block comments" />
     </comments>
   </general>
 </language>
 
 <!-- kate: space-indent on; indent-width 2; replace-tabs on; -->
diff --git a/data/syntax/pango.xml b/data/syntax/pango.xml
index 90e7dc9..1bf9211 100644
--- a/data/syntax/pango.xml
+++ b/data/syntax/pango.xml
@@ -1,161 +1,160 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Pango" version="4" kateversion="2.4" section="Markup" extensions="" mimetype=""  author="Jonathan Schmidt-Domniné &lt;devel@the-user.org&gt;" license="LGPL" priority="10">
+<language name="Pango" version="5" kateversion="2.4" section="Markup" extensions="" mimetype=""  author="Jonathan Schmidt-Domniné &lt;devel@the-user.org&gt;" license="LGPL" priority="10">
 
 <highlighting>
 <!-- NOTE: Currently, all keyword lists are already matched in the RegExp rules
            below. This could be heavily improved, any takers?
 
   <list name="tags">
       <item>&lt;span</item>
       <item>&lt;b</item>
       <item>&lt;big</item>
       <item>&lt;i</item>
       <item>&lt;s</item>
       <item>&lt;sub</item>
       <item>&lt;sup</item>
       <item>&lt;small</item>
       <item>&lt;tt</item>
       <item>&lt;u</item>
   </list>
   
   <list name="endtags">
       <item>&lt;/span&gt;</item>
       <item>&lt;/b&gt;</item>
       <item>&lt;/big&gt;</item>
       <item>&lt;/i&gt;</item>
       <item>&lt;/s&gt;</item>
       <item>&lt;/sub&gt;</item>
       <item>&lt;/sup&gt;</item>
       <item>&lt;/small&gt;</item>
       <item>&lt;/tt&gt;</item>
       <item>&lt;/u&gt;</item>
   </list>
   
   <list name="int_attributes">
       <item>size=</item>
       <item>font_size=</item>
       <item>rise=</item>
       <item>letter_spacing=</item>
   </list>
   
   <list name="plain_attributes">
       <item>font=</item>
       <item>font_desc=</item>
       <item>font_family=</item>
       <item>face=</item>
       <item>lang=</item>
   </list>
   
   <list name="color_attributes">
       <item>strikethrough_color=</item>
       <item>foreground=</item>
       <item>fgcolor=</item>
       <item>color=</item>
       <item>background=</item>
       <item>bgcolor=</item>
       <item>underline_color=</item>
   </list>
 -->
 
 <contexts>
   <context name="Start" attribute="Normal Text" lineEndContext="#stay">
     <IncludeRules context="FindPango" />
   </context>
 
   <context name="FindPango" attribute="Normal Text" lineEndContext="#stay">
     <DetectSpaces/>
     <RegExpr attribute="Element" context="#stay" String="&lt;/(span|b|big|i|s|sub|sup|small|tt|u)&gt;" endRegion="pango_node" />
     <RegExpr attribute="Element" context="FindAttributes" String="&lt;(span|b|big|i|s|sub|sup|small|tt|u)" beginRegion="pango_node" />
     <DetectIdentifier />
   </context>
 
   <context name="FindAttributes" attribute="Normal Text" lineEndContext="#stay">
       <DetectSpaces/>
       <RegExpr attribute="Key" context="InGravity" String="gravity=" />
       <RegExpr attribute="Key" context="InGravityHint" String="gravity_hint=" />
       <RegExpr attribute="Key" context="InStretch" String="(font_)?stretch=" />
       <RegExpr attribute="Key" context="InBoolean" String="(strikethrough|fallback)=" />
       <RegExpr attribute="Key" context="InStyle" String="(font_)?style=" />
       <RegExpr attribute="Key" context="InUnderline" String="underline=" />
       <RegExpr attribute="Key" context="InVariant" String="(font_)?variant=" />
       <RegExpr attribute="Key" context="InWeight" String="(font_)?weight=" />
       <RegExpr attribute="Key" context="InInt" String="(size|font_size|rise|letter_spacing)=" />
       <RegExpr attribute="Key" context="InString" String="(font|font_desc|font_family|face|lang)=" />
       <RegExpr attribute="Key" context="InColor" String="(strikethrough_color|foreground|fgcolor|color|background|bgcolor|underline_color)=" />
       <DetectChar attribute="Element" context="#pop" char="&gt;" />
       <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
   
   <context name="InGravity" attribute="String" lineEndContext="#stay">
       <RegExpr attribute="String" context="#pop" String="'(south|east|north|west|auto)'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
   
   <context name="InGravityHint" attribute="String" lineEndContext="#stay">
       <RegExpr attribute="String" context="#pop" String="'(natural|strong|line)'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
   
   <context name="InStretch" attribute="String" lineEndContext="#stay">
       <RegExpr attribute="String" context="#pop" String="'(ultracondensed|extracondensed|condensed|semicondensed|normal|semiexpanded|expanded|extraexpanded|ultraexpanded)'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
   
   <context name="InBoolean" attribute="String" lineEndContext="#stay">
       <RegExpr attribute="String" context="#pop" String="'(false|true)'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
   
   <context name="InStyle" attribute="String" lineEndContext="#stay">
       <RegExpr attribute="String" context="#pop" String="'(normal|oblique|italic)'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
   
   <context name="InUnderline" attribute="String" lineEndContext="#stay">
       <RegExpr attribute="String" context="#pop" String="'(none|single|double|low|error)'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
   
   <context name="InVariant" attribute="String" lineEndContext="#stay">
       <RegExpr attribute="String" context="#pop" String="'(normal|smallcaps)'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
 
   <context name="InWeight" attribute="String" lineEndContext="#stay">
       <RegExpr attribute="Decimal" context="#pop" String="'[0-9]*'" />
       <RegExpr attribute="String" context="#pop" String="'(ultralight|light|normal|bold|ultrabold|heavy)'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
   
   <context name="InColor" attribute="Color" lineEndContext="#stay">
       <RegExpr attribute="Color" context="#pop" String="'((#[0-9a-fA-F]{3}){1,4}|snow|ghost white|GhostWhite|white smoke|WhiteSmoke|gainsboro|floral white|FloralWhite|old lace|OldLace|linen|antique white|AntiqueWhite|papaya whip|PapayaWhip|blanched almond|BlanchedAlmond|bisque|peach puff|PeachPuff|navajo white|NavajoWhite|moccasin|cornsilk|ivory|lemon chiffon|LemonChiffon|seashell|honeydew|mint cream|MintCream|azure|alice blue|AliceBlue|lavender|lavender blush|LavenderBlush|misty rose|MistyRose|white|black|dark slate gray|DarkSlateGray|dark slate grey|DarkSlateGrey|dim gray|DimGray|dim grey|DimGrey|slate gray|SlateGray|slate grey|SlateGrey|light slate gray|LightSlateGray|light slate grey|LightSlateGrey|gray|grey|light grey|LightGrey|light gray|LightGray|midnight blue|MidnightBlue|navy|navy blue|NavyBlue|cornflower blue|CornflowerBlue|dark slate blue|DarkSlateBlue|slate blue|SlateBlue|medium slate blue|MediumSlateBlue|light slate blue|LightSlateBlue|medium blue|MediumBlue|royal blue|RoyalBlue|blue|dodger blue|DodgerBlue|deep sky blue|DeepSkyBlue|sky blue|SkyBlue|light sky blue|LightSkyBlue|steel blue|SteelBlue|light steel blue|LightSteelBlue|light blue|LightBlue|powder blue|PowderBlue|pale turquoise|PaleTurquoise|dark turquoise|DarkTurquoise|medium turquoise|MediumTurquoise|turquoise|cyan|light cyan|LightCyan|cadet blue|CadetBlue|medium aquamarine|MediumAquamarine|aquamarine|dark green|DarkGreen|dark olive green|DarkOliveGreen|dark sea green|DarkSeaGreen|sea green|SeaGreen|medium sea green|MediumSeaGreen|light sea green|LightSeaGreen|pale green|PaleGreen|spring green|SpringGreen|lawn green|LawnGreen|green|chartreuse|medium spring green|MediumSpringGreen|green yellow|GreenYellow|lime green|LimeGreen|yellow green|YellowGreen|forest green|ForestGreen|olive drab|OliveDrab|dark khaki|DarkKhaki|khaki|pale goldenrod|PaleGoldenrod|light goldenrod yellow|LightGoldenrodYellow|light yellow|LightYellow|yellow|gold|light goldenrod|LightGoldenrod|goldenrod|dark goldenrod|DarkGoldenrod|rosy brown|RosyBrown|indian red|IndianRed|saddle brown|SaddleBrown|sienna|peru|burlywood|beige|wheat|sandy brown|SandyBrown|tan|chocolate|firebrick|brown|dark salmon|DarkSalmon|salmon|light salmon|LightSalmon|orange|dark orange|DarkOrange|coral|light coral|LightCoral|tomato|orange red|OrangeRed|red|hot pink|HotPink|deep pink|DeepPink|pink|light pink|LightPink|pale violet red|PaleVioletRed|maroon|medium violet red|MediumVioletRed|violet red|VioletRed|magenta|violet|plum|orchid|medium orchid|MediumOrchid|dark orchid|DarkOrchid|dark violet|DarkViolet|blue violet|BlueViolet|purple|medium purple|MediumPurple|thistle|snow1|snow2|snow3|snow4|seashell1|seashell2|seashell3|seashell4|AntiqueWhite1|AntiqueWhite2|AntiqueWhite3|AntiqueWhite4|bisque1|bisque2|bisque3|bisque4|PeachPuff1|PeachPuff2|PeachPuff3|PeachPuff4|NavajoWhite1|NavajoWhite2|NavajoWhite3|NavajoWhite4|LemonChiffon1|LemonChiffon2|LemonChiffon3|LemonChiffon4|cornsilk1|cornsilk2|cornsilk3|cornsilk4|ivory1|ivory2|ivory3|ivory4|honeydew1|honeydew2|honeydew3|honeydew4|LavenderBlush1|LavenderBlush2|LavenderBlush3|LavenderBlush4|MistyRose1|MistyRose2|MistyRose3|MistyRose4|azure1|azure2|azure3|azure4|SlateBlue1|SlateBlue2|SlateBlue3|SlateBlue4|RoyalBlue1|RoyalBlue2|RoyalBlue3|RoyalBlue4|blue1|blue2|blue3|blue4|DodgerBlue1|DodgerBlue2|DodgerBlue3|DodgerBlue4|SteelBlue1|SteelBlue2|SteelBlue3|SteelBlue4|DeepSkyBlue1|DeepSkyBlue2|DeepSkyBlue3|DeepSkyBlue4|SkyBlue1|SkyBlue2|SkyBlue3|SkyBlue4|LightSkyBlue1|LightSkyBlue2|LightSkyBlue3|LightSkyBlue4|SlateGray1|SlateGray2|SlateGray3|SlateGray4|LightSteelBlue1|LightSteelBlue2|LightSteelBlue3|LightSteelBlue4|LightBlue1|LightBlue2|LightBlue3|LightBlue4|LightCyan1|LightCyan2|LightCyan3|LightCyan4|PaleTurquoise1|PaleTurquoise2|PaleTurquoise3|PaleTurquoise4|CadetBlue1|CadetBlue2|CadetBlue3|CadetBlue4|turquoise1|turquoise2|turquoise3|turquoise4|cyan1|cyan2|cyan3|cyan4|DarkSlateGray1|DarkSlateGray2|DarkSlateGray3|DarkSlateGray4|aquamarine1|aquamarine2|aquamarine3|aquamarine4|DarkSeaGreen1|DarkSeaGreen2|DarkSeaGreen3|DarkSeaGreen4|SeaGreen1|SeaGreen2|SeaGreen3|SeaGreen4|PaleGreen1|PaleGreen2|PaleGreen3|PaleGreen4|SpringGreen1|SpringGreen2|SpringGreen3|SpringGreen4|green1|green2|green3|green4|chartreuse1|chartreuse2|chartreuse3|chartreuse4|OliveDrab1|OliveDrab2|OliveDrab3|OliveDrab4|DarkOliveGreen1|DarkOliveGreen2|DarkOliveGreen3|DarkOliveGreen4|khaki1|khaki2|khaki3|khaki4|LightGoldenrod1|LightGoldenrod2|LightGoldenrod3|LightGoldenrod4|LightYellow1|LightYellow2|LightYellow3|LightYellow4|yellow1|yellow2|yellow3|yellow4|gold1|gold2|gold3|gold4|goldenrod1|goldenrod2|goldenrod3|goldenrod4|DarkGoldenrod1|DarkGoldenrod2|DarkGoldenrod3|DarkGoldenrod4|RosyBrown1|RosyBrown2|RosyBrown3|RosyBrown4|IndianRed1|IndianRed2|IndianRed3|IndianRed4|sienna1|sienna2|sienna3|sienna4|burlywood1|burlywood2|burlywood3|burlywood4|wheat1|wheat2|wheat3|wheat4|tan1|tan2|tan3|tan4|chocolate1|chocolate2|chocolate3|chocolate4|firebrick1|firebrick2|firebrick3|firebrick4|brown1|brown2|brown3|brown4|salmon1|salmon2|salmon3|salmon4|LightSalmon1|LightSalmon2|LightSalmon3|LightSalmon4|orange1|orange2|orange3|orange4|DarkOrange1|DarkOrange2|DarkOrange3|DarkOrange4|coral1|coral2|coral3|coral4|tomato1|tomato2|tomato3|tomato4|OrangeRed1|OrangeRed2|OrangeRed3|OrangeRed4|red1|red2|red3|red4|DeepPink1|DeepPink2|DeepPink3|DeepPink4|HotPink1|HotPink2|HotPink3|HotPink4|pink1|pink2|pink3|pink4|LightPink1|LightPink2|LightPink3|LightPink4|PaleVioletRed1|PaleVioletRed2|PaleVioletRed3|PaleVioletRed4|maroon1|maroon2|maroon3|maroon4|VioletRed1|VioletRed2|VioletRed3|VioletRed4|magenta1|magenta2|magenta3|magenta4|orchid1|orchid2|orchid3|orchid4|plum1|plum2|plum3|plum4|MediumOrchid1|MediumOrchid2|MediumOrchid3|MediumOrchid4|DarkOrchid1|DarkOrchid2|DarkOrchid3|DarkOrchid4|purple1|purple2|purple3|purple4|MediumPurple1|MediumPurple2|MediumPurple3|MediumPurple4|thistle1|thistle2|thistle3|thistle4|gray0|grey0|gray1|grey1|gray2|grey2|gray3|grey3|gray4|grey4|gray5|grey5|gray6|grey6|gray7|grey7|gray8|grey8|gray9|grey9|gray10|grey10|gray11|grey11|gray12|grey12|gray13|grey13|gray14|grey14|gray15|grey15|gray16|grey16|gray17|grey17|gray18|grey18|gray19|grey19|gray20|grey20|gray21|grey21|gray22|grey22|gray23|grey23|gray24|grey24|gray25|grey25|gray26|grey26|gray27|grey27|gray28|grey28|gray29|grey29|gray30|grey30|gray31|grey31|gray32|grey32|gray33|grey33|gray34|grey34|gray35|grey35|gray36|grey36|gray37|grey37|gray38|grey38|gray39|grey39|gray40|grey40|gray41|grey41|gray42|grey42|gray43|grey43|gray44|grey44|gray45|grey45|gray46|grey46|gray47|grey47|gray48|grey48|gray49|grey49|gray50|grey50|gray51|grey51|gray52|grey52|gray53|grey53|gray54|grey54|gray55|grey55|gray56|grey56|gray57|grey57|gray58|grey58|gray59|grey59|gray60|grey60|gray61|grey61|gray62|grey62|gray63|grey63|gray64|grey64|gray65|grey65|gray66|grey66|gray67|grey67|gray68|grey68|gray69|grey69|gray70|grey70|gray71|grey71|gray72|grey72|gray73|grey73|gray74|grey74|gray75|grey75|gray76|grey76|gray77|grey77|gray78|grey78|gray79|grey79|gray80|grey80|gray81|grey81|gray82|grey82|gray83|grey83|gray84|grey84|gray85|grey85|gray86|grey86|gray87|grey87|gray88|grey88|gray89|grey89|gray90|grey90|gray91|grey91|gray92|grey92|gray93|grey93|gray94|grey94|gray95|grey95|gray96|grey96|gray97|grey97|gray98|grey98|gray99|grey99|gray100|grey100|dark grey|DarkGrey|dark gray|DarkGray|dark blue|DarkBlue|dark cyan|DarkCyan|dark magenta|DarkMagenta|dark red|DarkRed|light green|LightGreen)'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
   
   <context name="InInt" attribute="Decimal" lineEndContext="#stay">
       <RegExpr attribute="Decimal" context="#pop" String="'(-?)[0-9]*'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
   
   <context name="InString" attribute="String" lineEndContext="#stay">
       <RegExpr attribute="String" context="#pop" String="'[^']*'" />
       <RegExpr attribute="Error" context="#pop#pop" String="\S" />
   </context>
 
 </contexts>
 <itemDatas>
   <itemData name="Normal Text" defStyleNum="dsNormal" />
   <itemData name="Element" defStyleNum="dsKeyword" />
   <itemData name="Key" defStyleNum="dsOthers" />
   <itemData name="Decimal" defStyleNum="dsDecVal" />
   <itemData name="Color" defStyleNum="dsFloat" />
   <itemData name="String" defStyleNum="dsString" />
   <itemData name="Error" defStyleNum="dsError" />
 </itemDatas>
 
 </highlighting>
   <general>
-    <indentation mode="xml" />
   </general>
 </language>
diff --git a/data/syntax/pug.xml b/data/syntax/pug.xml
index ea153be..c6a2793 100644
--- a/data/syntax/pug.xml
+++ b/data/syntax/pug.xml
@@ -1,119 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd" [
 <!ENTITY name "[A-Za-z][A-Za-z0-9_-]*">
 <!ENTITY voidtag "(area|base|br|col|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)">
 <!ENTITY entity "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|[A-Za-z][A-Za-z0-9_-]*);">
 ]>
 <!--
 
 Pug, known as Jade before, is a HTML template engine.
 
 https://pugjs.org/
 
 Changelog
 
 Version 1 - Guo Yunhe guoyunhebrave@gmail.com - 2017-04-14
 - Basic Pug/Jade syntax support
 - Do NOT support multi-line comment or text block
 
 -->
-<language name="Pug" version="4" kateversion="5.0" section="Markup" extensions="*.pug;*.jade" mimetype="" priority="10" author="Guo Yunhe (guoyunhebrave@gmail.com)" license="LGPL">
+<language name="Pug" version="5" kateversion="5.0" section="Markup" extensions="*.pug;*.jade" mimetype="" priority="10" author="Guo Yunhe (guoyunhebrave@gmail.com)" license="LGPL">
   <highlighting>
     <list name="controlflow">
       <item>case</item>
       <item>when</item>
       <item>default</item>
       <item>if</item>
       <item>unless</item>
       <item>else</item>
       <item>each</item>
       <item>while</item>
     </list>
     <contexts>
       <context name="Start" attribute="Normal Text" lineEndContext="#stay">
         <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/"/>
         <StringDetect attribute="Doctype" context="#stay" String="doctype" insensitive="true"/>
         <RegExpr attribute="ControlFlow" context="JavaScript" String="\belse if\b" firstNonSpace="true"/>
         <keyword attribute="ControlFlow" context="JavaScript" String="controlflow" firstNonSpace="true"/>
         <DetectIdentifier attribute="Normal Text" context="Element" firstNonSpace="true" lookAhead="true"/>
         <DetectChar attribute="Normal Text" context="Element" char="#" firstNonSpace="true" lookAhead="true"/>
         <DetectChar attribute="Normal Text" context="Element" char="." firstNonSpace="true" lookAhead="true"/>
         <DetectChar attribute="Normal Text" context="JavaScript" char="-" firstNonSpace="true"/>
         <DetectChar attribute="Normal Text" context="#stay" char="|" firstNonSpace="true"/>
       </context>
       <context name="FindInterpolation" attribute="Normal Text" lineEndContext="#stay">
         <Detect2Chars attribute="Interpolation" context="JavaScript" char="#" char1="{"/>
         <DetectChar attribute="Interpolation" context="#stay" char="}"/>
       </context>
       <context name="FindEntities" attribute="Normal Text" lineEndContext="#stay">
         <RegExpr attribute="Entity" context="#stay" String="&entity;"/>
         <AnyChar attribute="Error" context="#stay" String="&amp;&lt;"/>
       </context>
       <context name="Element" attribute="Normal Text" lineEndContext="#pop">
         <RegExpr attribute="Element" context="#stay" String="&name;"/>
         <RegExpr attribute="ID" context="#stay" String="#&name;"/>
         <RegExpr attribute="Class" context="#stay" String="\.&name;"/>
         <DetectChar attribute="Normal Text" context="Attributes" char="("/>
         <StringDetect attribute="Normal Text" context="AttributeObject" String="&amp;attributes("/>
         <RegExpr attribute="Normal Text" context="Element" String=":\s+"/>
         <RegExpr attribute="Normal Text" context="JavaScript" String="=\s+"/>
         <DetectChar attribute="Normal Text" context="Text" char=" "/>
       </context>
       <context name="Attributes" attribute="Normal Text" lineEndContext="#stay">
         <RegExpr attribute="Attribute" context="Attribute" String="(&name;|\(&name;\))"/>
         <DetectChar attribute="Normal Text" context="#pop" char=")"/>
       </context>
       <context name="AttributeObject" attribute="Normal Text" lineEndContext="#stay">
         <DetectChar attribute="Normal Text" context="#pop" char=")"/>
         <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
       </context>
       <context name="Attribute" attribute="Attribute" lineEndContext="#pop">
         <AnyChar attribute="Normal Text" context="#pop" String=",)" lookAhead="true"/>
         <RegExpr attribute="Attribute" context="#pop" String="\s+(&name;|\(&name;\))(=|\s|\))" lookAhead="true"/>
         <DetectChar attribute="Attribute" context="Value" char="="/>
       </context>
       <context name="Value" attribute="Normal Text" lineEndContext="#pop">
         <AnyChar attribute="Normal Text" context="#pop" String=",)" lookAhead="true"/>
         <RegExpr attribute="Attribute" context="#pop" String="\s+(&name;|\(&name;\))(=|\s|\))" lookAhead="true"/>
         <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
       </context>
       <context name="Text" attribute="Normal Text" lineEndContext="#pop">
         <DetectSpaces/>
         <IncludeRules context="FindEntities" includeAttrib="true"/>
         <IncludeRules context="FindInterpolation" includeAttrib="true"/>
       </context>
       <context name="JavaScript" attribute="Normal Text" lineEndContext="#pop">
         <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
         <AnyChar attribute="Normal Text" context="#pop" String=",)}:" lookAhead="true"/>
       </context>
       <context name="Comment" attribute="Comment" lineEndContext="#pop">
         <IncludeRules context="##Alerts"/>
       </context>
     </contexts>
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
       <itemData name="ControlFlow" defStyleNum="dsControlFlow" spellChecking="false"/>
       <itemData name="Comment" defStyleNum="dsComment"/>
       <itemData name="Doctype" defStyleNum="dsDataType" bold="1" spellChecking="false"/>
       <itemData name="Element" defStyleNum="dsKeyword" spellChecking="false"/>
       <itemData name="ID" defStyleNum="dsPreprocessor" spellChecking="false"/>
       <itemData name="Class" defStyleNum="dsFunction" spellChecking="false"/>
       <itemData name="Attribute" defStyleNum="dsAttribute" spellChecking="false"/>
       <itemData name="Entity" defStyleNum="dsDecVal" spellChecking="false"/>
       <itemData name="Interpolation" defStyleNum="dsPreprocessor" spellChecking="false"/>
       <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
     </itemDatas>
   </highlighting>
   <general>
     <keywords casesensitive="1" weakDeliminator="-"/>
     <comments>
       <comment name="singleLine" start="//-"/>
       <comment name="singleLine" start="//"/>
     </comments>
-    <indentation mode="python"/>
     <folding indentationsensitive="1"/>
     <emptyLines>
       <emptyLine regexpr="(?:\s+|\s*#.*)"/>
     </emptyLines>
   </general>
 </language>
diff --git a/data/syntax/python.xml b/data/syntax/python.xml
index 7a3cd68..59b31d6 100644
--- a/data/syntax/python.xml
+++ b/data/syntax/python.xml
@@ -1,687 +1,686 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language>
 <!-- Python syntax highlightning v0.9 by Per Wigren -->
 <!-- Python syntax highlighting v1.9 by Michael Bueker (improved keyword differentiation) -->
 <!-- Python syntax highlighting v1.97 by Paul Giannaros -->
 <!-- Python syntax highlighting v1.99 by Primoz Anzur -->
 <!-- Python syntax highlighting v2.01 by Paul Giannaros:
 	* full format character support
 	* unicode string modifier supported -->
 <!-- v2.02 remove RegExpr for nums and make indent consistent -->
 <!-- v2.03 highlight decorators, remove operator regex, don't highlight parens as operators -->
 <!-- v2.04 make alerts visible even if they are directly after ''' or # without a space -->
 <!-- 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 -->
 <!-- v2.29 recognize escape sequenzes correctly -->
-<language name="Python" version="6" style="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
+<language name="Python" version="7" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
 	<highlighting>
 		<list name="import">
 			<item>import</item>
 			<item>from</item>
 			<item>as</item>
 		</list>
 		<list name="defs">
 			<item>class</item>
 			<item>def</item>
 			<item>del</item>
 			<item>global</item>
 			<item>lambda</item>
 			<item>nonlocal</item>
 		</list>
 		<list name="operators">
 			<item>and</item>
 			<item>in</item>
 			<item>is</item>
 			<item>not</item>
 			<item>or</item>
 		</list>
 		<list name="flow">
 			<item>assert</item>
 			<item>break</item>
 			<item>continue</item>
 			<item>elif</item>
 			<item>else</item>
 			<item>except</item>
 			<item>finally</item>
 			<item>for</item>
 			<item>if</item>
 			<item>pass</item>
 			<item>raise</item>
 			<item>return</item>
 			<item>try</item>
 			<item>while</item>
 			<item>with</item>
 			<item>yield</item>
 			<item>async</item>
 			<item>await</item>
 		</list>
 		<list name="builtinfuncs">
 			<item>__import__</item>
 			<item>abs</item>
 			<item>all</item>
 			<item>any</item>
 			<item>apply</item>
 			<item>ascii</item>
 			<item>basestring</item>
 			<item>bin</item>
 			<item>bool</item>
 			<item>buffer</item>
 			<item>bytearray</item>
 			<item>bytes</item>
 			<item>callable</item>
 			<item>chr</item>
 			<item>classmethod</item>
 			<item>cmp</item>
 			<item>coerce</item>
 			<item>compile</item>
 			<item>complex</item>
 			<item>delattr</item>
 			<item>dict</item>
 			<item>dir</item>
 			<item>divmod</item>
 			<item>enumerate</item>
 			<item>eval</item>
 			<item>exec</item>
 			<item>execfile</item>
 			<item>file</item>
 			<item>filter</item>
 			<item>float</item>
 			<item>format</item>
 			<item>frozenset</item>
 			<item>getattr</item>
 			<item>globals</item>
 			<item>hasattr</item>
 			<item>hash</item>
 			<item>help</item>
 			<item>hex</item>
 			<item>id</item>
 			<item>input</item>
 			<item>int</item>
 			<item>intern</item>
 			<item>isinstance</item>
 			<item>issubclass</item>
 			<item>iter</item>
 			<item>len</item>
 			<item>list</item>
 			<item>locals</item>
 			<item>long</item>
 			<item>map</item>
 			<item>max</item>
 			<item>memoryview</item>
 			<item>min</item>
 			<item>next</item>
 			<item>object</item>
 			<item>oct</item>
 			<item>open</item>
 			<item>ord</item>
 			<item>pow</item>
 			<item>print</item>
 			<item>property</item>
 			<item>range</item>
 			<item>raw_input</item>
 			<item>reduce</item>
 			<item>reload</item>
 			<item>repr</item>
 			<item>reversed</item>
 			<item>round</item>
 			<item>set</item>
 			<item>setattr</item>
 			<item>slice</item>
 			<item>sorted</item>
 			<item>staticmethod</item>
 			<item>str</item>
 			<item>sum</item>
 			<item>super</item>
 			<item>tuple</item>
 			<item>type</item>
 			<item>unichr</item>
 			<item>unicode</item>
 			<item>vars</item>
 			<item>xrange</item>
 			<item>zip</item>
 		</list>
 		<list name="specialvars">
 			<item>None</item>
 			<item>self</item>
 			<item>True</item>
 			<item>False</item>
 			<item>NotImplemented</item>
 			<item>Ellipsis</item>
 			<item>__debug__</item>
 			<item>__file__</item>
 			<item>__name__</item>
 		</list>
 		<list name="bindings">
 			<item>SIGNAL</item>
 			<item>SLOT</item>
 			<item>connect</item>
 		</list>
 		<list name="overloaders">
 			<item>__new__</item>
 			<item>__init__</item>
 			<item>__del__</item>
 			<item>__repr__</item>
 			<item>__str__</item>
 			<item>__lt__</item>
 			<item>__le__</item>
 			<item>__eq__</item>
 			<item>__ne__</item>
 			<item>__gt__</item>
 			<item>__ge__</item>
 			<item>__cmp__</item>
 			<item>__rcmp__</item>
 			<item>__hash__</item>
 			<item>__nonzero__</item>
 			<item>__unicode__</item>
 			<item>__getattr__</item>
 			<item>__setattr__</item>
 			<item>__delattr__</item>
 			<item>__getattribute__</item>
 			<item>__get__</item>
 			<item>__set__</item>
 			<item>__delete__</item>
 			<item>__call__</item>
 			<item>__len__</item>
 			<item>__getitem__</item>
 			<item>__setitem__</item>
 			<item>__delitem__</item>
 			<item>__iter__</item>
 			<item>__reversed__</item>
 			<item>__contains__</item>
 			<item>__getslice__</item>
 			<item>__setslice__</item>
 			<item>__delslice__</item>
 			<item>__add__</item>
 			<item>__sub__</item>
 			<item>__mul__</item>
 			<item>__floordiv__</item>
 			<item>__mod__</item>
 			<item>__divmod__</item>
 			<item>__pow__</item>
 			<item>__lshift__</item>
 			<item>__rshift__</item>
 			<item>__and__</item>
 			<item>__xor__</item>
 			<item>__or__</item>
 			<item>__div__</item>
 			<item>__truediv__</item>
 			<item>__radd__</item>
 			<item>__rsub__</item>
 			<item>__rmul__</item>
 			<item>__rdiv__</item>
 			<item>__rtruediv__</item>
 			<item>__rfloordiv__</item>
 			<item>__rmod__</item>
 			<item>__rdivmod__</item>
 			<item>__rpow__</item>
 			<item>__rlshift__</item>
 			<item>__rrshift__</item>
 			<item>__rand__</item>
 			<item>__rxor__</item>
 			<item>__ror__</item>
 			<item>__iadd__</item>
 			<item>__isub__</item>
 			<item>__imul__</item>
 			<item>__idiv__</item>
 			<item>__itruediv__</item>
 			<item>__ifloordiv__</item>
 			<item>__imod__</item>
 			<item>__ipow__</item>
 			<item>__ilshift__</item>
 			<item>__irshift__</item>
 			<item>__iand__</item>
 			<item>__ixor__</item>
 			<item>__ior__</item>
 			<item>__neg__</item>
 			<item>__pos__</item>
 			<item>__abs__</item>
 			<item>__invert__</item>
 			<item>__complex__</item>
 			<item>__int__</item>
 			<item>__long__</item>
 			<item>__float__</item>
 			<item>__oct__</item>
 			<item>__hex__</item>
 			<item>__index__</item>
 			<item>__coerce__</item>
 			<item>__enter__</item>
 			<item>__exit__</item>
 			<item>__bytes__</item>
 			<item>__format__</item>
 			<item>__next__</item>
 			<item>__dir__</item>
 			<item>__await__</item>
 			<item>__aiter__</item>
 			<item>__anext__</item>
 			<item>__aenter__</item>
 			<item>__aexit__</item>
 		</list>
 		<list name="exceptions">
 			<!--
 				Exceptions list resources used:
 				- http://docs.python.org/2.7/library/exceptions.html#exception-hierarchy
 				- http://docs.python.org/3.4/library/exceptions.html#exception-hierarchy
 			-->
 			<item>ArithmeticError</item>
 			<item>AssertionError</item>
 			<item>AttributeError</item>
 			<item>BaseException</item>
 			<item>BlockingIOError</item>
 			<item>BrokenPipeError</item>
 			<item>BufferError</item>
 			<item>BytesWarning</item>
 			<item>ChildProcessError</item>
 			<item>ConnectionAbortedError</item>
 			<item>ConnectionError</item>
 			<item>ConnectionRefusedError</item>
 			<item>ConnectionResetError</item>
 			<item>DeprecationWarning</item>
 			<item>EnvironmentError</item>
 			<item>EOFError</item>
 			<item>Exception</item>
 			<item>FileExistsError</item>
 			<item>FileNotFoundError</item>
 			<item>FloatingPointError</item>
 			<item>FutureWarning</item>
 			<item>GeneratorExit</item>
 			<item>ImportError</item>
 			<item>ImportWarning</item>
 			<item>IndentationError</item>
 			<item>IndexError</item>
 			<item>InterruptedError</item>
 			<item>IOError</item>
 			<item>IsADirectoryError</item>
 			<item>KeyboardInterrupt</item>
 			<item>KeyError</item>
 			<item>LookupError</item>
 			<item>MemoryError</item>
 			<item>NameError</item>
 			<item>NotADirectoryError</item>
 			<item>NotImplementedError</item>
 			<item>OSError</item>
 			<item>OverflowError</item>
 			<item>PendingDeprecationWarning</item>
 			<item>PermissionError</item>
 			<item>ProcessLookupError</item>
 			<item>ReferenceError</item>
 			<item>ResourceWarning</item>
 			<item>RuntimeError</item>
 			<item>RuntimeWarning</item>
 			<item>StandardError</item>
 			<item>StopIteration</item>
 			<item>SyntaxError</item>
 			<item>SyntaxWarning</item>
 			<item>SystemError</item>
 			<item>SystemExit</item>
 			<item>TabError</item>
 			<item>TimeoutError</item>
 			<item>TypeError</item>
 			<item>UnboundLocalError</item>
 			<item>UnicodeDecodeError</item>
 			<item>UnicodeEncodeError</item>
 			<item>UnicodeError</item>
 			<item>UnicodeTranslateError</item>
 			<item>UnicodeWarning</item>
 			<item>UserWarning</item>
 			<item>ValueError</item>
 			<item>Warning</item>
 			<item>WindowsError</item>
 			<item>ZeroDivisionError</item>
 		</list>
 		<contexts>
 			<context name="Normal" attribute="Normal Text" lineEndContext="#stay">
 				<keyword attribute="Import" String="import" context="#stay"/>
 				<keyword attribute="Definition Keyword" String="defs" context="#stay"/>
 				<keyword attribute="Operator Keyword" String="operators" context="#stay"/>
 				<keyword attribute="Flow Control Keyword" String="flow" context="#stay"/>
 				<keyword attribute="Builtin Function" String="builtinfuncs" context="#stay"/>
 				<keyword attribute="Special Variable" String="specialvars" context="#stay"/>
 				<keyword attribute="Extensions" String="bindings" context="#stay"/>
 				<keyword attribute="Exceptions" String="exceptions" context="#stay"/>
 				<keyword attribute="Overloaders" String="overloaders" context="#stay"/>
 				<RegExpr attribute="Normal Text" String="[a-zA-Z_][a-zA-Z_0-9]{2,}" context="#stay"/>
 
 				<RegExpr attribute="Complex" String=" ((([0-9]*\.[0-9]+|[0-9]+\.)|([0-9]+|([0-9]*\.[0-9]+|[0-9]+\.))[eE](\+|-)?[0-9]+)|[0-9]+)[jJ]" context="#stay"/>
 				<Float attribute="Float" context="#stay" />
 				<HlCHex attribute="Hex" context="#stay"/>
 				<HlCOct attribute="Octal" context="#stay"/>
 				<Int attribute="Int" context="#stay">
 					<StringDetect attribute="Int" String="L" insensitive="true" context="#stay"/>
 				</Int>
 
 				<RegExpr attribute="Int" String=" ([0-9]+_)+[0-9]+" context="#stay"/>
 				<RegExpr attribute="Float" String=" ([0-9]+_)+[0-9]+\.[0-9]+" context="#stay"/>
 				<RegExpr attribute="Hex" String=" [0-9]x([A-F0-9]+_)+[A-F0-9]+" context="#stay"/>
 
 				<DetectChar attribute="Normal Text" char="{" context="Dictionary" beginRegion="Dictionary"/>
 				<DetectChar attribute="Normal Text" char="[" context="List" beginRegion="List"/>
 				<DetectChar attribute="Normal Text" char="(" context="Tuple" beginRegion="Tuple"/>
 
 				<IncludeRules context="CommentVariants" />
 
 				<DetectChar attribute="Comment" char="#" context="Hash comment"/>
 
 				<IncludeRules context="StringVariants" />
 
 				<RegExpr attribute="Decorator" String="@[_a-zA-Z][\._a-zA-Z0-9]*" firstNonSpace="true"/>
 				<AnyChar attribute="Operator" String="+*/%\|=;\!&lt;&gt;!^&amp;~-@" context="#stay"/>
 			</context>
 
 			<context name="#CheckForString" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
 				<DetectSpaces/>
 				<LineContinue attribute="Normal Text" context="CheckForStringNext"/>
 			</context>
 
 			<context name="CheckForStringNext" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
 				<DetectSpaces/>
 				<LineContinue attribute="Normal Text" context="CheckForStringNext"/>
 				<IncludeRules context="StringVariants"/>
 			</context>
 
 			<context name="StringVariants" attribute="Normal Text" lineEndContext="#stay">
 				<DetectSpaces/>
 
 				<RegExpr attribute="String" String="u?'''"                insensitive="true" context="Triple A-string" beginRegion="Triple A-region"/>
 				<RegExpr attribute="String" String="u?&quot;&quot;&quot;" insensitive="true" context="Triple Q-string" beginRegion="Triple Q-region"/>
 				<RegExpr attribute="String" String="u?'"                  insensitive="true" context="Single A-string"/>
 				<RegExpr attribute="String" String="u?&quot;"             insensitive="true" context="Single Q-string"/>
 
 				<RegExpr attribute="Raw String" String="(u?r|ru)'''"                insensitive="true" context="Raw Triple A-string" beginRegion="Triple A-region"/>
 				<RegExpr attribute="Raw String" String="(u?r|ru)&quot;&quot;&quot;" insensitive="true" context="Raw Triple Q-string" beginRegion="Triple Q-region"/>
 				<RegExpr attribute="Raw String" String="(u?r|ru)'"                  insensitive="true" context="Raw A-string"/>
 				<RegExpr attribute="Raw String" String="(u?r|ru)&quot;"             insensitive="true" context="Raw Q-string"/>
 
 				<StringDetect attribute="F-String" String="f'''"                insensitive="true" context="Triple A-F-String" beginRegion="Triple A-region"/>
 				<StringDetect attribute="F-String" String="f&quot;&quot;&quot;" insensitive="true" context="Triple Q-F-String" beginRegion="Triple Q-region"/>
 				<StringDetect attribute="F-String" String="f'"                  insensitive="true" context="Single A-F-String"/>
 				<StringDetect attribute="F-String" String="f&quot;"             insensitive="true" context="Single Q-F-String"/>
 
 				<RegExpr attribute="Raw F-String" String="(fr|rf)'''"                insensitive="true" context="Raw Triple A-F-String" beginRegion="Triple A-region"/>
 				<RegExpr attribute="Raw F-String" String="(fr|rf)&quot;&quot;&quot;" insensitive="true" context="Raw Triple Q-F-String" beginRegion="Triple Q-region"/>
 				<RegExpr attribute="Raw F-String" String="(fr|rf)'"                  insensitive="true" context="Raw A-F-String"/>
 				<RegExpr attribute="Raw F-String" String="(fr|rf)&quot;"             insensitive="true" context="Raw Q-F-String"/>
 			</context>
 
 			<context name="CommentVariants" attribute="Normal Text" lineEndContext="#stay">
 				<DetectSpaces/>
 
 				<RegExpr attribute="Comment" String="u?'''"                insensitive="true" firstNonSpace="true" context="Triple A-comment" beginRegion="Triple A-region"/>
 				<RegExpr attribute="Comment" String="u?&quot;&quot;&quot;" insensitive="true" firstNonSpace="true" context="Triple Q-comment" beginRegion="Triple Q-region"/>
 				<RegExpr attribute="Comment" String="u?'"                  insensitive="true" firstNonSpace="true" context="Single A-comment"/>
 				<RegExpr attribute="Comment" String="u?&quot;"             insensitive="true" firstNonSpace="true" context="Single Q-comment"/>
 
 				<RegExpr attribute="Comment" String="(u?r|ru)'''"                insensitive="true" firstNonSpace="true" context="Triple A-comment" beginRegion="Triple A-region"/>
 				<RegExpr attribute="Comment" String="(u?r|ru)&quot;&quot;&quot;" insensitive="true" firstNonSpace="true" context="Triple Q-comment" beginRegion="Triple Q-region"/>
 				<RegExpr attribute="Comment" String="(u?r|ru)'"                  insensitive="true" firstNonSpace="true" context="Single A-comment"/>
 				<RegExpr attribute="Comment" String="(u?r|ru)&quot;"             insensitive="true" firstNonSpace="true" context="Single Q-comment"/>
 			</context>
 
 			<context name="Dictionary" attribute="Normal Text" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<DetectSpaces/>
 				<DetectChar attribute="Normal Text" char="}" context="#pop" endRegion="Dictionary"/>
 				<IncludeRules context="StringVariants" />
 				<IncludeRules context="Normal" />
 			</context>
 
 			<context name="List" attribute="Normal Text" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<DetectSpaces/>
 				<DetectChar attribute="Normal Text" char="]" context="#pop" endRegion="List"/>
 				<IncludeRules context="StringVariants" />
 				<IncludeRules context="Normal" />
 			</context>
 
 			<context name="Tuple" attribute="Normal Text" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<DetectSpaces/>
 				<DetectChar attribute="Normal Text" char=")" context="#pop" endRegion="Tuple"/>
 				<IncludeRules context="StringVariants" />
 				<IncludeRules context="Normal" />
 			</context>
 
 			<!-- Comments -->
 
 			<context name="Hash comment" attribute="Comment" lineEndContext="#pop">
 				<IncludeRules context="##Alerts" />
 				<IncludeRules context="##Modelines" />
 			</context>
 
 			<context name="Triple A-comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<StringDetect attribute="Comment" String="'''" context="#pop" endRegion="Triple A-region"/>
 				<IncludeRules context="##Alerts_indent" />
 			</context>
 
 			<context name="Triple Q-comment" attribute="Comment" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<StringDetect attribute="Comment" String="&quot;&quot;&quot;" context="#pop" endRegion="Triple Q-region"/>
 				<IncludeRules context="##Alerts_indent" />
 			</context>
 
 			<context name="Single A-comment" attribute="Comment" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<DetectChar attribute="Comment" char="'" context="#pop"/>
 				<IncludeRules context="##Alerts_indent" />
 			</context>
 
 			<context name="Single Q-comment" attribute="Comment" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<DetectChar attribute="Comment" char="&quot;" context="#pop"/>
 				<IncludeRules context="##Alerts_indent" />
 			</context>
 
 			<!-- Strings -->
 
 			<!-- format characters -->
 			<context name="stringformat" attribute="String Substitution" lineEndContext="#stay">
 				<!-- Python 2 style. Syntax:
 				     1. start character '%'
 				     2. [optional] Mapping key, e.g. '(foo)'
 				     3. [optional] Conversion flags, one of '#0- +'
 				     4. [optional] Minimum width, integer or '*'
 				     5. [optional] Precision, '.' followed by integer or '*'
 				     6. [optional] Length modifier, one of 'hlL'
 				     7. conversion type, one of 'crsdiouxXeEfFgG%'
 				     [Special cases: %prog and %default - see http://docs.python.org/library/optparse.html]
 				-->
 				<RegExpr attribute="String Substitution" String="%((\([a-zA-Z0-9_]+\))?[#0\- +]?([1-9][0-9]*|\*)?(\.([1-9][0-9]*|\*))?[hlL]?[crsdiouxXeEfFgG%]|prog|default)" context="#stay"/>
 				<!-- http://docs.python.org/2/library/string.html#format-string-syntax:
 				     replacement_field ::=  "{" [field_name] ["!" conversion] [":" format_spec] "}"
 				     field_name        ::=  arg_name ("." attribute_name | "[" element_index "]")*
 				     arg_name          ::=  [identifier | integer]
 				     attribute_name    ::=  identifier
 				     element_index     ::=  integer | index_string
 				     index_string      ::=  <any source character except "]"> +
 				     conversion        ::=  "r" | "s"
 				     format_spec       ::=  [[fill]align][sign][#][0][width][,][.precision][type]
 				     fill              ::=  <any character>
 				     align             ::=  "<" | ">" | "=" | "^"
 				     sign              ::=  "+" | "-" | " "
 				     width             ::=  integer
 				     precision         ::=  integer
 				     type              ::=  "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
 				-->
 				<RegExpr attribute="String Substitution" String="\{(([a-zA-Z0-9_]+|[0-9]+)(\.[a-zA-Z0-9_]+|\[[^ \]]+\])*)?(![rs])?(:([^}]?[&lt;&gt;=^])?[ +-]?#?0?[0-9]*(\.[0-9]+)?[bcdeEfFgGnosxX%]?)?\}" context="#stay"/>
 				<Detect2Chars attribute="String Substitution" char="{" char1="{" context="#stay" />
 				<Detect2Chars attribute="String Substitution" char="}" char1="}" context="#stay" />
 			</context>
 
 			<!-- escape characters -->
 			<context name="stringescape" attribute="String Char" lineEndContext="#stay">
 				<!-- As this highlighting style is for both, Python 2 and 3,
 				we do not know if a normal string is “unicode” or not. So we
 				-->
 				<RegExpr attribute="String Char" String="\\[\\'&quot;abfnrtv]" context="#stay"/>
 				<RegExpr attribute="String Char" String="\\[0-7]{1,3}" context="#stay"/>
 				<RegExpr attribute="String Char" String="\\x[0-9A-Fa-f]{2}" context="#stay"/>
 				<RegExpr attribute="String Char" String="\\u[0-9A-Fa-f]{4}" context="#stay"/>
 				<RegExpr attribute="String Char" String="\\U[0-9A-Fa-f]{8}" context="#stay"/>
 				<RegExpr attribute="String Char" String="\\N\{[a-zA-Z0-9\- ]+\}" context="#stay"/>
 			</context>
 
 			<!-- f-literals -->
 			<context name="stringinterpolation" attribute="F-String" lineEndContext="#stay">
 				<Detect2Chars attribute="String Char" char="{" char1="{" context="#stay"/>
 				<DetectChar attribute="String Substitution" char="{" context="String Interpolation"/>
 			</context>
 			<context name="String Interpolation" attribute="String Substitution" lineEndContext="#stay">
 				<DetectChar attribute="Error" char="\" context="#pop"/>
 				<RegExpr attribute="String Substitution" String="(![rs])?(:([^}]?[&lt;&gt;=^])?[ +-]?#?0?[0-9]*(\.[0-9]+)?[bcdeEfFgGnosxX%]?)?\}" context="#pop"/>
 				<IncludeRules context="Normal"/> <!-- TODO: create expression context instead -->
 			</context>
 
 
 			<!--
 			It follows a Binary tree of string kinds (not even touching byte literals).
 			The levels are:
 			1. triple- vs. single-quoted
 			2. apostrophe vs. quotation mark
 			3. static vs. interpolated (f-literal)
 			4. escaped vs. raw
 			Adding byte literals wouldn’t make the current 2⁴ into 2⁵ contexts, as there are no byte f-literals
 			-->
 
 
 			<!-- Triple-quoted A-strings -->
 			<context name="Triple A-string" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringformat"/>
 				<StringDetect attribute="String" String="'''" context="#pop#CheckForString" endRegion="Triple A-region"/>
 			</context>
 
 			<context name="Raw Triple A-string" attribute="Raw String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
 				<IncludeRules context="stringformat"/>
 				<StringDetect attribute="Raw String" String="'''" context="#pop#CheckForString" endRegion="Triple A-region"/>
 			</context>
 
 			<context name="Triple A-F-String" attribute="F-String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringinterpolation"/>
 				<StringDetect attribute="F-String" String="'''" context="#pop#CheckForString" endRegion="Triple A-region"/>
 			</context>
 
 			<context name="Raw Triple A-F-String" attribute="Raw F-String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="Raw F-String" context="#stay"/>
 				<IncludeRules context="stringinterpolation"/>
 				<StringDetect attribute="Raw F-String" String="'''" context="#pop#CheckForString" endRegion="Triple A-region"/>
 			</context>
 
 			<!-- Triple-quoted Q-strings -->
 			<context name="Triple Q-string" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringformat"/>
 				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="#pop#CheckForString" endRegion="Triple Q-region"/>
 			</context>
 
 			<context name="Raw Triple Q-string" attribute="Raw String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
 				<IncludeRules context="stringformat"/>
 				<StringDetect attribute="Raw String" String="&quot;&quot;&quot;" context="#pop#CheckForString" endRegion="Triple Q-region"/>
 			</context>
 
 			<context name="Triple Q-F-String" attribute="F-String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringinterpolation"/>
 				<StringDetect attribute="F-String" String="&quot;&quot;&quot;" context="#pop#CheckForString" endRegion="Triple Q-region"/>
 			</context>
 
 			<context name="Raw Triple Q-F-String" attribute="Raw F-String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="Raw F-String" context="#stay"/>
 				<IncludeRules context="stringinterpolation"/>
 				<StringDetect attribute="Raw F-String" String="&quot;&quot;&quot;" context="#pop#CheckForString" endRegion="Triple Q-region"/>
 			</context>
 
 
 			<!-- Single-quoted A-strings -->
 			<context name="Single A-string" attribute="String" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringformat"/>
 				<DetectChar attribute="String" char="'" context="#pop#CheckForString"/>
 			</context>
 
 			<context name="Raw A-string" attribute="Raw String" lineEndContext="#stay">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
 				<IncludeRules context="stringformat"/>
 				<DetectChar attribute="Raw String" char="'" context="#pop#CheckForString"/>
 			</context>
 
 			<context name="Single A-F-String" attribute="F-String" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringinterpolation"/>
 				<DetectChar attribute="F-String" char="'" context="#pop#CheckForString"/>
 			</context>
 
 			<context name="Raw A-F-String" attribute="Raw F-String" lineEndContext="#stay">
 				<HlCStringChar attribute="Raw F-String" context="#stay"/>
 				<IncludeRules context="stringinterpolation"/>
 				<DetectChar attribute="Raw F-String" char="'" context="#pop#CheckForString"/>
 			</context>
 
 			<!-- Single-quoted Q-strings -->
 			<context name="Single Q-string" attribute="String" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringformat"/>
 				<DetectChar attribute="String" char="&quot;" context="#pop#CheckForString"/>
 			</context>
 
 			<context name="Raw Q-string" attribute="Raw String" lineEndContext="#stay">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
 				<IncludeRules context="stringformat"/>
 				<DetectChar attribute="Raw String" char="&quot;" context="#pop#CheckForString"/>
 			</context>
 
 			<context name="Single Q-F-String" attribute="F-String" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringinterpolation"/>
 				<DetectChar attribute="F-String" char="&quot;" context="#pop#CheckForString"/>
 			</context>
 
 			<context name="Raw Q-F-String" attribute="Raw F-String" lineEndContext="#stay">
 				<HlCStringChar attribute="Raw F-String" context="#stay"/>
 				<IncludeRules context="stringinterpolation"/>
 				<DetectChar attribute="Raw F-String" char="&quot;" context="#pop#CheckForString"/>
 			</context>
 		</contexts>
 
 		<itemDatas>
 			<itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
 			<itemData name="Definition Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
 			<itemData name="Operator" defStyleNum="dsOperator" spellChecking="false"/>
 			<itemData name="Operator Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
 			<itemData name="Flow Control Keyword" defStyleNum="dsControlFlow" spellChecking="false"/>
 			<itemData name="Builtin Function" defStyleNum="dsBuiltIn" spellChecking="false"/>
 			<itemData name="Special Variable" defStyleNum="dsVariable" spellChecking="false"/>
 			<itemData name="Extensions" defStyleNum="dsExtension" spellChecking="false"/>
 			<itemData name="Exceptions" defStyleNum="dsPreprocessor" spellChecking="false"/>
 			<itemData name="Overloaders" defStyleNum="dsFunction" spellChecking="false"/>
 			<itemData name="Import" defStyleNum="dsImport" spellChecking="false"/>
 			<itemData name="Float" defStyleNum="dsFloat" spellChecking="false"/>
 			<itemData name="Int" defStyleNum="dsDecVal" spellChecking="false"/>
 			<itemData name="Hex" defStyleNum="dsBaseN" spellChecking="false"/>
 			<itemData name="Octal" defStyleNum="dsBaseN" spellChecking="false"/>
 			<itemData name="Complex" defStyleNum="dsOthers" spellChecking="false"/>
 			<itemData name="Comment" defStyleNum="dsComment"/>
 			<itemData name="String" defStyleNum="dsString"/>
 			<itemData name="Raw String" defStyleNum="dsVerbatimString"/>
 			<itemData name="F-String" defStyleNum="dsSpecialString"/>
 			<itemData name="Raw F-String" defStyleNum="dsVerbatimString"/>
 			<itemData name="String Char" defStyleNum="dsChar" spellChecking="false"/>
 			<itemData name="String Substitution" defStyleNum="dsSpecialChar" spellChecking="false"/>
 			<itemData name="Decorator" defStyleNum="dsAttribute" spellChecking="false"/>
 			<itemData name="Error" defStyleNum="dsError"/>
 		</itemDatas>
 	</highlighting>
 	<general>
 		<folding indentationsensitive="1" />
 		<emptyLines>
 			<emptyLine regexpr="(?:\s+|\s*#.*)"/>
 		</emptyLines>
 		<comments>
 			<comment name="singleLine" start="#" position="afterwhitespace"/>
 		</comments>
-		<indentation mode="python" />
 		<keywords casesensitive="1" additionalDeliminator="#'"/>
 	</general>
 </language>
 
 <!-- kate: space-indent off; indent-width 4; -->
diff --git a/data/syntax/xml.xml b/data/syntax/xml.xml
index 0165852..035bba6 100644
--- a/data/syntax/xml.xml
+++ b/data/syntax/xml.xml
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
 	<!-- names must start with a letter, ideogram or underscore. \w matches any
 		 word character *or* a number, hence the lookahead -->
 	<!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="XML" version="7" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml;*.xbel;*.dae" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/x-xbel;application/xml;application/scxml+xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="XML" version="8" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml;*.xbel;*.dae" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/x-xbel;application/xml;application/scxml+xml" casesensitive="1" indenter="xml" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <highlighting>
 <contexts>
   <context name="Start" attribute="Normal Text" lineEndContext="#stay">
     <IncludeRules context="FindXML" />
   </context>
 
   <context name="FindXML" attribute="Normal Text" lineEndContext="#stay">
     <DetectSpaces />
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
     <StringDetect attribute="CDATA" context="CDATA" String="&lt;![CDATA[" beginRegion="cdata" />
     <RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" beginRegion="doctype" />
     <RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:_-]*" beginRegion="pi" />
     <RegExpr attribute="Element" context="Element" String="&lt;&name;" beginRegion="element" />
     <IncludeRules context="FindEntityRefs" />
     <DetectIdentifier />
   </context>
 
   <context name="FindEntityRefs" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
     <AnyChar attribute="Error" context="#stay" String="&amp;&lt;" />
   </context>
 
   <context name="FindPEntityRefs" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
     <RegExpr attribute="PEntityRef" context="#stay" String="%&name;;" />
     <AnyChar attribute="Error" context="#stay" String="&amp;%" />
   </context>
 
 
   <context name="Comment" attribute="Comment" lineEndContext="#stay">
     <DetectSpaces />
     <StringDetect attribute="Comment" context="#pop" String="--&gt;" endRegion="comment" />
     <RegExpr attribute="Error" context="#stay" String="-(-(?!-&gt;))+" />
     <IncludeRules context="##Alerts" />
     <DetectIdentifier />
   </context>
 
   <context name="CDATA" attribute="Other Text" lineEndContext="#stay">
     <DetectSpaces />
     <DetectIdentifier />
     <StringDetect attribute="CDATA" context="#pop" String="]]&gt;" endRegion="cdata" />
     <StringDetect attribute="EntityRef" context="#stay" String="]]&amp;gt;" />
   </context>
 
   <context name="PI" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Processing Instruction" context="#pop" char="?" char1="&gt;" endRegion="pi" />
   </context>
 
   <context name="Doctype" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="&gt;" endRegion="doctype" />
     <DetectChar attribute="Doctype" context="Doctype Internal Subset" char="[" beginRegion="int_subset" />
   </context>
 
   <context name="Doctype Internal Subset" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="]" endRegion="int_subset" />
     <RegExpr attribute="Doctype" context="Doctype Markupdecl" String="&lt;!(ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
     <RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:_-]*" beginRegion="pi" />
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
   <context name="Doctype Markupdecl" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="&gt;" />
     <DetectChar attribute="Value" context="Doctype Markupdecl DQ" char="&quot;" />
     <DetectChar attribute="Value" context="Doctype Markupdecl SQ" char="&apos;" />
   </context>
 
   <context name="Doctype Markupdecl DQ" attribute="Value" lineEndContext="#stay">
     <DetectChar attribute="Value" context="#pop" char="&quot;" />
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
   <context name="Doctype Markupdecl SQ" attribute="Value" lineEndContext="#stay">
     <DetectChar attribute="Value" context="#pop" char="&apos;" />
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
   <context name="Element" attribute="Other Text" lineEndContext="#stay">
     <Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" endRegion="element" />
     <DetectChar attribute="Element" context="El Content" char="&gt;" />
     <RegExpr attribute="Attribute" context="Attribute" String="^&name;" />
     <RegExpr attribute="Attribute" context="Attribute" String="\s+&name;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
   <context name="El Content" attribute="Other Text" lineEndContext="#stay">
     <RegExpr attribute="Element" context="El End" String="&lt;/&name;" />
     <IncludeRules context="FindXML" />
   </context>
 
   <context name="El End" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Element" context="#pop#pop#pop" char="&gt;" endRegion="element" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
   <context name="Attribute" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Attribute" context="Value" char="=" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
   <context name="Value" attribute="Other Text" lineEndContext="#stay">
     <DetectChar attribute="Value" context="Value DQ" char="&quot;" />
     <DetectChar attribute="Value" context="Value SQ" char="&apos;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
   <context name="Value DQ" attribute="Value" lineEndContext="#stay">
     <DetectChar attribute="Value" context="#pop#pop#pop" char="&quot;" />
     <IncludeRules context="FindEntityRefs" />
   </context>
 
   <context name="Value SQ" attribute="Value" lineEndContext="#stay">
     <DetectChar attribute="Value" context="#pop#pop#pop" char="&apos;" />
     <IncludeRules context="FindEntityRefs" />
   </context>
 
 </contexts>
 <itemDatas>
   <itemData name="Normal Text" defStyleNum="dsNormal" />
   <itemData name="Other Text" defStyleNum="dsNormal" />
   <itemData name="Comment" defStyleNum="dsComment" spellChecking="false" />
   <itemData name="CDATA" defStyleNum="dsBaseN" bold="1" spellChecking="false" />
   <itemData name="Processing Instruction" defStyleNum="dsKeyword" spellChecking="false" />
   <itemData name="Doctype" defStyleNum="dsDataType" bold="1" spellChecking="false" />
   <itemData name="Element" defStyleNum="dsKeyword" spellChecking="false" />
   <itemData name="Attribute" defStyleNum="dsOthers" spellChecking="false" />
   <itemData name="Value" defStyleNum="dsString" spellChecking="false" />
   <itemData name="EntityRef" defStyleNum="dsDecVal" spellChecking="false" />
   <itemData name="PEntityRef" defStyleNum="dsDecVal" spellChecking="false" />
   <itemData name="Error" defStyleNum="dsError" spellChecking="false" />
 </itemDatas>
 
 </highlighting>
 <general>
   <comments>
     <comment name="multiLine" start="&lt;!--" end="--&gt;" />
   </comments>
-  <indentation mode="xml" />
 </general>
 </language>
diff --git a/data/syntax/xmldebug.xml b/data/syntax/xmldebug.xml
index 28c6073..5bb913d 100644
--- a/data/syntax/xmldebug.xml
+++ b/data/syntax/xmldebug.xml
@@ -1,593 +1,592 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language version="7" kateversion="2.4" name="XML (Debug)" section="Markup" extensions="" mimetype="">
+<language version="8" kateversion="2.4" name="XML (Debug)" section="Markup" extensions="" mimetype="" indenter="xml">
   <highlighting>
     <list name="AttType">
         <item>CDATA</item>
         <item>ID</item>
         <item>IDREF</item>
         <item>IDREFS</item>
         <item>ENTITY</item>
         <item>ENTITIES</item>
         <item>NMTOKEN</item>
         <item>NMTOKENS</item>
     </list>
     <contexts>
 
 	<context name="0:prolog" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Doctype Declaration" context="1:XMLDecl Version" String="&lt;\?xml(\s+|$)"/>
 	</context>
 
 	<context name="1:XMLDecl Version" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="2:XMLDecl Version Eq" String="\s*version\s*"/>
 	  <RegExpr attribute="Doctype Declaration" String="\s+" context="#stay"/>
 	</context>
 
 	<context name="2:XMLDecl Version Eq" attribute="Error" lineEndContext="5:XMLDecl Encoding Eq">
 	  <RegExpr attribute="Attribute" context="3:XMLDecl Version" String="\s*=\s*"/>
 	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="3:XMLDecl Version" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="4:XMLDecl Encoding" String="\s*(&quot;[A-Za-z0-9:._-]*&quot;|'[A-Za-z0-9:._-]*')(?!e)\s*"/>
 	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="4:XMLDecl Encoding" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="5:XMLDecl Encoding Eq" String="\s*encoding\s*"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <RegExpr attribute="Doctype Declaration" context="11:Misc after XMLDecl" String="\?>"/>
 	</context>
 
 	<context name="5:XMLDecl Encoding Eq" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="6:XMLDecl Encoding" String="\s*=\s*"/>
 	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="6:XMLDecl Encoding" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="7:XMLDecl Standalone" String="\s*(&quot;[A-Za-z][A-Za-z0-9._-]*&quot;|'[A-Za-z][A-Za-z0-9._-]*')(?!s)\s*"/>
 	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="7:XMLDecl Standalone" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="8:XMLDecl Standalone Eq" String="\s*standalone\s*"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <RegExpr attribute="Doctype Declaration" context="11:Misc after XMLDecl" String="\?>"/>
 	</context>
 
 	<context name="8:XMLDecl Standalone Eq" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="9:XMLDecl Standalone" String="\s*=\s*"/>
 	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="9:XMLDecl Standalone" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="10:XMLDecl Standalone" String="\s*&quot;(yes|no)&quot;|'(yes|no)'\s*"/>
 	  <RegExpr attribute="Attribute" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="10:XMLDecl Standalone" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <RegExpr attribute="Doctype Declaration" context="11:Misc after XMLDecl" String="\?>"/>
 	</context>
 
 	<context name="11:Misc after XMLDecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Normal Text" context="#stay" String="\s+"/>
 	  <RegExpr attribute="Comment" context="12:Comment after XMLDecl" String="\s*&lt;!--\s*"/>
 	  <RegExpr attribute="Processing Instruction" context="13:PI after XMLDecl" String="\s*&lt;\?xml-stylesheet(\s+|$)"/>
 	  <RegExpr attribute="Error" context="13:PI after XMLDecl" String="\s*&lt;\??[xX][mM][lL]"/>
 	  <RegExpr attribute="Processing Instruction" context="13:PI after XMLDecl" String="\s*&lt;\?[a-zA-Z_][a-zA-Z0-9_-]*(:[a-zA-Z0-9_-]*)?(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="14:Doctype Decl Name" String="&lt;!DOCTYPE(\s+|$)"/>
 	 <RegExpr attribute="Error" context="80:STag" String="&lt;[xX][mM][lL](\w|[_.-])*(:(\w|[_.-])+)?"/>
          <RegExpr attribute="Normal Tag" context="80:STag" String="&lt;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|_)(\w|[_.-])*(:(\w|[_.-])+)?"/>
 	 <RegExpr attribute="Error" context="80:STag" String="&lt;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
 	 <RegExpr attribute="Error" context="85:ETag" String="&lt;/[xX][mM][lL](\w|[_.-])*(:(\w|[_.-])+)?"/>
          <RegExpr attribute="Normal Tag" context="85:ETag" String="&lt;/(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|_)(\w|[_.-])*(:(\w|[_.-])+)?"/>
 	 <RegExpr attribute="Error" context="85:ETag" String="&lt;/(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
 	 <RegExpr attribute="Entity" context="79:Outside" String="&amp;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	 <RegExpr attribute="Entity" context="79:Outside" String="&amp;#(x[0-9a-fA-F]+|[0-9]+);"/>
 	 <RegExpr attribute="Entity" context="86:CDSect" String="&lt;!\[CDATA\["/>
 	 <RegExpr attribute="Comment" context="87:Comment inside IS" String="&lt;!--"/>
 	 <RegExpr attribute="Normal Tag" context="88:PI inside IS" String="&lt;\?xml-stylesheet(\s|$)"/>
 	 <RegExpr attribute="Error" context="88:PI inside IS" String="&lt;\?[xX][mM][lL](\w|[_.-])*(:(\w|[_.-])+)?"/>
          <RegExpr attribute="Normal Tag" context="88:PI inside IS" String="&lt;\?(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|_)(\w|[_.-])*(:(\w|[_.-])+)?"/>
 	 <RegExpr attribute="Error" context="88:PI inside IS" String="&lt;\?(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
 	 <DetectChar attribute="Error" context="79:Outside" char="&lt;"/>
 	 <DetectChar attribute="Error" context="79:Outside" char="&amp;"/>
 	 <RegExpr attribute="Error" context="79:Outside" String="\]\]>"/>
 	</context>
 
 	<context name="12:Comment after XMLDecl" attribute="Comment" lineEndContext="#stay">
 	  <RegExpr attribute="Error" context="#pop" String="--->"/>
 	  <RegExpr attribute="Comment" context="#pop" String="-->"/>
 	  <Detect2Chars attribute="Error" context="#stay" char="-" char1="-"/>
 	</context>
 
 	<context name="13:PI after XMLDecl" attribute="Processing Instruction Body" lineEndContext="#stay">
 	  <Detect2Chars attribute="Processing Instruction" context="#pop" char="?" char1="&gt;"/>
 	</context>
 
 	<context name="14:Doctype Decl Name" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Doctype Declaration" context="15:Doctype Decl ExternalID" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="15:Doctype Decl ExternalID" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Doctype Declaration" context="16:Doctype Decl PublicID" String="PUBLIC(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="19:Doctype Decl SystemID" String="SYSTEM(\s+|$)"/>
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char="["/>
     <!-- rodda: this was originally context="?", so my best guess... most likely wrong -->
     <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="16:Doctype Decl PublicID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="17:Doctype Decl PublicID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="18:Doctype Decl PublicID q" char="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="17:Doctype Decl PublicID qq" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="19:Doctype Decl SystemID" char="&quot;"/>
 	  <RegExpr attribute="Value" context="#stay" String="[&#x20;&#xD;&#xA;a-zA-Z0-9'()+,./:=?;!*#@$_%-]"/>
 	</context>
 
 	<context name="18:Doctype Decl PublicID q" attribute="Value" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="19:Doctype Decl SystemID" char="'"/>
 	  <RegExpr attribute="Value" context="#stay" String="[&#x20;&#xD;&#xA;a-zA-Z0-9()+,./:=?;!*#@$_%-]"/>
 	</context>
 
 	<context name="19:Doctype Decl SystemID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="20:Doctype Decl SystemID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="21:Doctype Decl SystemID q" char="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="20:Doctype Decl SystemID qq" attribute="Value" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="22:Doctype Decl IS or end" char="&quot;"/>
 	</context>
 
 	<context name="21:Doctype Decl SystemID q" attribute="Value" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="22:Doctype Decl IS or end" char="'"/>
 	</context>
 
 	<context name="22:Doctype Decl IS or end" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char="["/>
 	  <DetectChar attribute="Doctype Declaration" context="79:Outside" char=">"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="23:Doctype Decl IS" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="#stay" String="%(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <RegExpr attribute="Doctype Declaration" context="24:elementdecl" String="&lt;!ELEMENT(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="38:AttlistDecl" String="&lt;!ATTLIST(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="50:EntityDecl" String="&lt;!ENTITY(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="71:NotationDecl Name" String="&lt;!NOTATION(\s+|$)"/>
 	  <RegExpr attribute="Comment" context="77:Comment inside IS" String="\s*&lt;!--\s*"/>
 	  <RegExpr attribute="Processing Instruction" context="78:PI inside IS" String="\s*&lt;\?xml-stylesheet(\s+|$)"/>
 	  <RegExpr attribute="Error" context="78:PI inside IS" String="\s*&lt;\??[xX][mM][lL]"/>
 	  <RegExpr attribute="Processing Instruction" context="78:PI inside IS" String="\s*&lt;\?[a-zA-Z_][a-zA-Z0-9_-]*(:[a-zA-Z0-9_-]*)?(\s+|$)"/>
 	  <Detect2Chars attribute="Doctype Declaration" context="79:Outside" char="]" char1=">"/>
 	</context>
 
 	<context name="24:elementdecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Normal Tag" context="25:contentspec" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="25:contentspec" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="37:element end" String="(EMPTY|ANY)"/>
 	  <DetectChar attribute="Attribute" context="26:MixedOrChildren" char="("/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="26:MixedOrChildren" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="27:MixedShort" String="#PCDATA"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <DetectChar attribute="Doctype Declaration" context="30:children unknown" char="("/>
 	  <RegExpr attribute="Value" context="30:children unknown" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*[\?\*\+]?"/>
 	</context>
 
 	<context name="27:MixedShort" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="28:MixedLong" char="|"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <DetectChar attribute="Doctype Declaration" context="37:element end" char=")"/>
 	</context>
 
 	<context name="28:MixedLong" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="29:MixedLong endOrContinue" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="29:MixedLong endOrContinue" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="#pop" char="|"/>
 	  <RegExpr attribute="Doctype Declaration" context="#pop#pop" String="\s+"/>
 	  <Detect2Chars attribute="Doctype Declaration" context="37:element end" char=")" char1="*"/>
 	</context>
 
 	<context name="30:children unknown" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="33:children choice" char="|"/>
 	  <DetectChar attribute="Doctype Declaration" context="35:children seq" char=","/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <RegExpr attribute="Doctype Declaration" context="31:children unknownOrEnd" String="\)[\?\*\+]?"/>
 	</context>
 
 	<context name="31:children unknownOrEnd" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="33:children choice" char="|"/>
 	  <DetectChar attribute="Doctype Declaration" context="35:children seq" char=","/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\)[\?\*\+]?"/>
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
 	</context>
 
 	<context name="32:children unknownName" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="30:children unknown" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*[\?\*\+]?"/>
 	  <DetectChar attribute="Doctype Declaration" context="#stay" char="("/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="33:children choice" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="34:children choiceOrEnd" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*[\?\*\+]?"/>
 	  <DetectChar attribute="Doctype Declaration" context="32:children unknownName" char="("/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="34:children choiceOrEnd" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="#pop" char="|"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <RegExpr attribute="Doctype Declaration" context="31:children unknownOrEnd" String="\)[\?\*\+]?"/>
 	</context>
 
 	<context name="35:children seq" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="36:children seqOrEnd" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*[\?\*\+]?"/>
 	  <DetectChar attribute="Doctype Declaration" context="32:children unknownName" char="("/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="36:children seqOrEnd" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="#pop" char=","/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <RegExpr attribute="Doctype Declaration" context="31:children unknownOrEnd" String="\)[\?\*\+]?"/>
 	</context>
 
 	<context name="37:element end" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="38:AttlistDecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Normal Tag" context="39:AttDef" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
 	  <RegExpr attribute="Normal Tag" context="23:Doctype Decl IS" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*>"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="39:AttDef" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="40:AttType" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
 	</context>
 
 	<context name="40:AttType" attribute="Error" lineEndContext="#stay">
           <keyword attribute="Doctype Declaration" context="46:DefaultDecl" String="AttType"/>
 	  <RegExpr attribute="Doctype Declaration" context="41:NotationStart" String="NOTATION(\s+|$)"/>
           <DetectChar attribute="Doctype Declaration" context="42:Notation" char="("/>
 	  <RegExpr attribute="Doctype Declaration" context="#pop" String="\s+"/>
 	</context>
 
 	<context name="41:NotationStart" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="42:Notation" char="("/>
 	  <RegExpr attribute="Doctype Declaration" context="#pop#pop" String="\s+"/>
 	</context>
 
 	<context name="42:Notation" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="43:Notation or End" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="43:Notation or End" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="#pop" char="|"/>
 	  <RegExpr attribute="Doctype Declaration" context="46:DefaultDecl" String="\)(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 <!--
 	<context name="44:Enumeration" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="#stay" String="(\w|[_:.-])+"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="45:Enumeration or End" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="44:Enumeration" char="|"/>
 	  <RegExpr attribute="Doctype Declaration" context="46:DefaultDecl" String="\)(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>-->
 
 	<context name="46:DefaultDecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Attribute" context="39:AttDef" String="(#REQUIRED|#IMPLIED)(\s+|$)"/>
 	  <RegExpr attribute="Attribute" context="47:DefaultDecl AttValue" String="#FIXED(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	  <RegExpr attribute="Value" context="48:DefaultDecl AttValue qq" String="&quot;"/>
 	  <RegExpr attribute="Value" context="49:DefaultDecl AttValue q" String="'"/>
 	</context>
 
 	<context name="47:DefaultDecl AttValue" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="48:DefaultDecl AttValue qq" String="&quot;"/>
 	  <RegExpr attribute="Value" context="49:DefaultDecl AttValue q" String="'"/>
 	</context>
 
  	<context name="48:DefaultDecl AttValue qq" attribute="Value" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="#stay" String="&amp;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	  <RegExpr attribute="Entity" context="#stay" String="&amp;#(x[0-9a-fA-F]+|[0-9]+);"/>
 	  <DetectChar attribute="Error" context="#stay" char="&amp;"/>
 	  <DetectChar attribute="Error" context="#stay" char="&lt;"/>
           <DetectChar attribute="Value" context="39:AttDef" char="&quot;"/>
   	</context>
 
 	<context name="49:DefaultDecl AttValue q" attribute="Value" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="#stay" String="&amp;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	  <RegExpr attribute="Entity" context="#stay" String="&amp;#(x[0-9a-fA-F]+|[0-9]+);"/>
 	  <DetectChar attribute="Error" context="#stay" char="&amp;"/>
 	  <DetectChar attribute="Error" context="#stay" char="&lt;"/>
           <DetectChar attribute="Value" context="39:AttDef" char="&quot;"/>
 	</context>
 
 	<context name="50:EntityDecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="52:GEDecl EntityValueOrExternalID" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
 	  <DetectChar attribute="Entity" context="61:PEDecl" char="%"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 <!-- 	<context name="51:unused" attribute="Error" lineEndContext="#stay" /> -->
 
 	<context name="52:GEDecl EntityValueOrExternalID" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="53:GEDecl EntityValue qq" String="&quot;"/>
 	  <RegExpr attribute="Value" context="54:GEDecl EntityValue q" String="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="55:GEDecl PublicID" String="PUBLIC(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="58:GEDecl SystemID" String="SYSTEM(\s+|$)"/>
 	</context>
 
  	<context name="53:GEDecl EntityValue qq" attribute="Value" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="#stay" String="[&amp;%](?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	  <RegExpr attribute="Entity" context="#stay" String="&amp;#(x[0-9a-fA-F]+|[0-9]+);"/>
 	  <DetectChar attribute="Error" context="#stay" char="&amp;"/>
 	  <DetectChar attribute="Error" context="#stay" char="%"/>
 	  <DetectChar attribute="Error" context="#stay" char="&lt;"/>
           <DetectChar attribute="Value" context="69:GEDecl endOrNDATA" char="&quot;"/>
   	</context>
 
  	<context name="54:GEDecl EntityValue q" attribute="Value" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="#stay" String="[&amp;%](?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	  <RegExpr attribute="Entity" context="#stay" String="&amp;#(x[0-9a-fA-F]+|[0-9]+);"/>
 	  <DetectChar attribute="Error" context="#stay" char="&amp;"/>
 	  <DetectChar attribute="Error" context="#stay" char="%"/>
 	  <DetectChar attribute="Error" context="#stay" char="&lt;"/>
           <DetectChar attribute="Value" context="69:GEDecl endOrNDATA" char="'"/>
   	</context>
 
 	<context name="55:GEDecl PublicID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="56:GEDecl PublicID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="57:GEDecl PublicID q" char="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="56:GEDecl PublicID qq" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="58:GEDecl SystemID" char="&quot;"/>
 	  <RegExpr attribute="Value" context="#stay" String="[&#x20;&#xD;&#xA;a-zA-Z0-9'()+,./:=?;!*#@$_%-]"/>
 	</context>
 
 	<context name="57:GEDecl PublicID q" attribute="Value" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="58:GEDecl SystemID" char="'"/>
 	  <RegExpr attribute="Value" context="#stay" String="[&#x20;&#xD;&#xA;a-zA-Z0-9()+,./:=?;!*#@$_%-]"/>
 	</context>
 
 	<context name="58:GEDecl SystemID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="59:GEDecl SystemID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="60:GEDecl SystemID q" char="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="59:GEDecl SystemID qq" attribute="Value" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="69:GEDecl endOrNDATA" char="&quot;"/>
 	</context>
 
 	<context name="60:GEDecl SystemID q" attribute="Value" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="69:GEDecl endOrNDATA" char="'"/>
 	</context>
 
 	<context name="61:PEDecl" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="62:PEDecl EntityValueOrExternalID" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="62:PEDecl EntityValueOrExternalID" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Value" context="53:GEDecl EntityValue qq" String="&quot;"/>
 	  <RegExpr attribute="Value" context="54:GEDecl EntityValue q" String="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="63:PEDecl PublicID" String="PUBLIC(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="66:PEDecl SystemID" String="SYSTEM(\s+|$)"/>
 	</context>
 
 	<context name="63:PEDecl PublicID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="64:PEDecl PublicID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="65:PEDecl PublicID q" char="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="64:PEDecl PublicID qq" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="66:PEDecl SystemID" char="&quot;"/>
 	  <RegExpr attribute="Value" context="#stay" String="[&#x20;&#xD;&#xA;a-zA-Z0-9'()+,./:=?;!*#@$_%-]"/>
 	</context>
 
 	<context name="65:PEDecl PublicID q" attribute="Value" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="66:PEDecl SystemID" char="'"/>
 	  <RegExpr attribute="Value" context="#stay" String="[&#x20;&#xD;&#xA;a-zA-Z0-9()+,./:=?;!*#@$_%-]"/>
 	</context>
 
 	<context name="66:PEDecl SystemID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="67:PEDecl SystemID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="68:PEDecl SystemID q" char="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="67:PEDecl SystemID qq" attribute="Value" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="37:element end" char="&quot;"/>
 	</context>
 
 	<context name="68:PEDecl SystemID q" attribute="Value" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="37:element end" char="'"/>
 	</context>
 
 	<context name="69:GEDecl endOrNDATA" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
 	  <RegExpr attribute="Doctype Declaration" context="70:GEDecl NDATA" String="NDATA(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="70:GEDecl NDATA" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="37:element end" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="71:NotationDecl Name" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Entity" context="72:NotationDecl ExternalID" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="72:NotationDecl ExternalID" attribute="Error" lineEndContext="#stay">
 	  <RegExpr attribute="Doctype Declaration" context="73:NotationDecl PublicID" String="PUBLIC(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="66:PEDecl SystemID" String="SYSTEM(\s+|$)"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="73:NotationDecl PublicID" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="74:NotationDecl PublicID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="75:NotationDecl PublicID q" char="'"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="74:NotationDecl PublicID qq" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="76:NotationDecl SystemIDOrEnd" char="&quot;"/>
 	  <RegExpr attribute="Value" context="#stay" String="[&#x20;&#xD;&#xA;a-zA-Z0-9'()+,./:=?;!*#@$_%-]"/>
 	</context>
 
 	<context name="75:NotationDecl PublicID q" attribute="Value" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="76:NotationDecl SystemIDOrEnd" char="'"/>
 	  <RegExpr attribute="Value" context="#stay" String="[&#x20;&#xD;&#xA;a-zA-Z0-9()+,./:=?;!*#@$_%-]"/>
 	</context>
 
 	<context name="76:NotationDecl SystemIDOrEnd" attribute="Error" lineEndContext="#stay">
 	  <DetectChar attribute="Value" context="67:PEDecl SystemID qq" char="&quot;"/>
 	  <DetectChar attribute="Value" context="68:PEDecl SystemID q" char="'"/>
 	  <DetectChar attribute="Doctype Declaration" context="23:Doctype Decl IS" char=">"/>
 	  <RegExpr attribute="Doctype Declaration" context="#stay" String="\s+"/>
 	</context>
 
 	<context name="77:Comment inside IS" attribute="Comment" lineEndContext="#stay">
 	  <RegExpr attribute="Error" context="23:Doctype Decl IS" String="--->"/>
 	  <RegExpr attribute="Comment" context="23:Doctype Decl IS" String="-->"/>
 	  <Detect2Chars attribute="Error" context="#stay" char="-" char1="-"/>
 	</context>
 
 	<context name="78:PI inside IS" attribute="Processing Instruction Body" lineEndContext="#stay">
 	  <Detect2Chars attribute="Processing Instruction" context="23:Doctype Decl IS" char="?" char1="&gt;"/>
 	</context>
 
        <context name="79:Outside" attribute="Normal Text" lineEndContext="#stay">
 	 <RegExpr attribute="Error" context="80:STag" String="&lt;[xX][mM][lL](\w|[_.-])*(:(\w|[_.-])+)?"/>
          <RegExpr attribute="Normal Tag" context="80:STag" String="&lt;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|_)(\w|[_.-])*(:(\w|[_.-])+)?"/>
 	 <RegExpr attribute="Error" context="80:STag" String="&lt;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
 	 <RegExpr attribute="Error" context="85:ETag" String="&lt;/[xX][mM][lL](\w|[_.-])*(:(\w|[_.-])+)?"/>
          <RegExpr attribute="Normal Tag" context="85:ETag" String="&lt;/(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|_)(\w|[_.-])*(:(\w|[_.-])+)?"/>
 	 <RegExpr attribute="Error" context="85:ETag" String="&lt;/(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
 	 <RegExpr attribute="Entity" context="#stay" String="&amp;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	 <RegExpr attribute="Entity" context="#stay" String="&amp;#(x[0-9a-fA-F]+|[0-9]+);"/>
 	 <RegExpr attribute="Entity" context="86:CDSect" String="&lt;!\[CDATA\["/>
 	 <RegExpr attribute="Comment" context="87:Comment inside IS" String="&lt;!--"/>
 	 <RegExpr attribute="Normal Tag" context="88:PI inside IS" String="&lt;\?xml-stylesheet(\s|$)"/>
 	 <RegExpr attribute="Error" context="88:PI inside IS" String="&lt;\?[xX][mM][lL](\w|[_.-])*(:(\w|[_.-])+)?"/>
          <RegExpr attribute="Normal Tag" context="88:PI inside IS" String="&lt;\?(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|_)(\w|[_.-])*(:(\w|[_.-])+)?"/>
 	 <RegExpr attribute="Error" context="88:PI inside IS" String="&lt;\?(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
 	 <DetectChar attribute="Error" context="#stay" char="&lt;"/>
 	 <DetectChar attribute="Error" context="#stay" char="&amp;"/>
 	 <RegExpr attribute="Error" context="#stay" String="\]\]>"/>
        </context>
 
        <context name="80:STag" attribute="Error" lineEndContext="#stay">
 	 <Detect2Chars attribute="Normal Tag" context="79:Outside" char="/" char1="&gt;"/>
 	 <DetectChar attribute="Normal Tag" context="79:Outside" char="&gt;"/>
 	 <RegExpr attribute="Attribute" context="81:STag Attribute" String="(xmlns:(\w|[_.-])*|xmlns|xml:(lang|base|space))"/>
 	 <RegExpr attribute="Error" context="81:STag Attribute" String="[xX][mM][lL](\w|[_.-])*(:(\w|[_.-])+)?"/>
          <RegExpr attribute="Attribute" context="81:STag Attribute" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|_)(\w|[_.-])*(:(\w|[_.-])+)?"/>
 	 <RegExpr attribute="Error" context="81:STag Attribute" String="(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[:_])(\w|[:_.-])*"/>
          <RegExpr attribute="Normal Tag" context="#stay" String="\s+"/>
        </context>
 
        <context name="81:STag Attribute" attribute="Error" lineEndContext="#stay">
 	 <DetectChar attribute="Attribute" context="82:STag Attribute Value" char="="/>
          <RegExpr attribute="Normal Tag" context="#stay" String="\s+"/>
        </context>
 
        <context name="82:STag Attribute Value" attribute="Error" lineEndContext="#stay">
          <DetectChar attribute="Value" context="83:STag Value qq" char="&quot;"/>
          <DetectChar attribute="Value" context="84:STag Value q" char="'"/>
          <RegExpr attribute="Normal Tag" context="#stay" String="\s+"/>
        </context>
 
        <context name="83:STag Value qq" attribute="Value" lineEndContext="#stay">
 	 <RegExpr attribute="Entity" context="#stay" String="&amp;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	 <RegExpr attribute="Entity" context="#stay" String="&amp;#(x[0-9a-fA-F]+|[0-9]+);"/>
 	 <DetectChar attribute="Error" context="#stay" char="&amp;"/>
 	 <DetectChar attribute="Error" context="#stay" char="&lt;"/>
          <RegExpr attribute="Error" context="80:STag" String="&quot;(?=(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:]))"/>
          <RegExpr attribute="Value" context="80:STag" String="&quot;(?=>|/>|\s|$)"/>
        </context>
 
        <context name="84:STag Value q" attribute="Value" lineEndContext="#stay">
 	 <RegExpr attribute="Entity" context="#stay" String="&amp;(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:])(\w|[_:.-])*;"/>
 	 <RegExpr attribute="Entity" context="#stay" String="&amp;#(x[0-9a-fA-F]+|[0-9]+);"/>
 	 <DetectChar attribute="Error" context="#stay" char="&amp;"/>
 	 <DetectChar attribute="Error" context="#stay" char="&lt;"/>
          <RegExpr attribute="Error" context="80:STag" String="'(?=(?![&#x0660;-&#x0669;&#x06F0;-&#x06F9;&#x0966;-&#x096F;&#x09E6;-&#x09EF;&#x0A66;-&#x0A6F;&#x0AE6;-&#x0AEF;&#x0B66;-&#x0B6F;&#x0BE7;-&#x0BEF;&#x0C66;-&#x0C6F;&#x0CE6;-&#x0CEF;&#x0D66;-&#x0D6F;&#x0E50;-&#x0E59;&#x0ED0;-&#x0ED9;&#x0F20;-&#x0F29;]|\d)(\w|[_:]))"/>
          <RegExpr attribute="Value" context="80:STag" String="'(?=>|/>|\s|$)"/>
        </context>
 
        <context name="85:ETag" attribute="Error" lineEndContext="#stay">
 	 <DetectChar attribute="Normal Tag" context="79:Outside" char="&gt;"/>
          <RegExpr attribute="Normal Tag" context="#stay" String="\s+"/>
        </context>
 
        <context name="86:CDSect" attribute="Normal Text" lineEndContext="#stay">
          <RegExpr attribute="Entity" context="79:Outside" String="\]\]>"/>
        </context>
 
 	<context name="87:Comment inside IS" attribute="Comment" lineEndContext="#stay">
 	  <RegExpr attribute="Error" context="79:Outside" String="--->"/>
 	  <RegExpr attribute="Comment" context="79:Outside" String="-->"/>
 	  <Detect2Chars attribute="Error" context="#stay" char="-" char1="-"/>
 	</context>
 
 	<context name="88:PI inside IS" attribute="Processing Instruction Body" lineEndContext="#stay">
 	  <Detect2Chars attribute="Processing Instruction" context="79:Outside" char="?" char1="&gt;"/>
 	</context>
 
     </contexts>
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal"/>
       <itemData name="Entity" defStyleNum="dsChar"/>
       <itemData name="Normal Tag" defStyleNum="dsKeyword"/>
       <itemData name="Attribute" defStyleNum="dsDataType"/>
       <itemData name="Value" defStyleNum="dsString"/>
       <itemData name="Doctype Declaration" defStyleNum="dsKeyword"/>
       <itemData name="Comment" defStyleNum="dsComment"/>
       <itemData name="Processing Instruction" defStyleNum="dsKeyword"/>
       <itemData name="Processing Instruction Body" defStyleNum="dsNormal"/>
       <itemData name="Error" defStyleNum="dsError"/>
     </itemDatas>
   </highlighting>
   <general>
     <comments>
       <comment name="multiLine" start="&lt;!--" end="--&gt;"/>
     </comments>
     <keywords casesensitive="1"/>
-    <indentation mode="xml" />
   </general>
 </language>
diff --git a/data/syntax/xul.xml b/data/syntax/xul.xml
index 5e913d2..8dc6b65 100644
--- a/data/syntax/xul.xml
+++ b/data/syntax/xul.xml
@@ -1,625 +1,624 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-        <language name="XUL" version="4" kateversion="2.4" section="Markup" extensions="*.xul;*.xbl" mimetype="text/xul" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl), Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net), Marc Dassonneville (marc.dassonneville@gmail.com)" license="LGPL">
+<language name="XUL" version="5" kateversion="5.0" section="Markup" extensions="*.xul;*.xbl" mimetype="text/xul" casesensitive="1" indenter="xml" 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">
       <item>if</item>
       <item>else</item>
       <item>for</item>
       <item>in</item>
       <item>while</item>
       <item>do</item>
       <item>continue</item>
       <item>break</item>
       <item>with</item>
       <item>try</item>
       <item>catch</item>
       <item>finally</item>
       <item>switch</item>
       <item>case</item>
       <item>new</item>
       <item>var</item>
       <item>function</item>
       <item>return</item>
       <item>delete</item>
       <item>true</item>
       <item>false</item>
       <item>void</item>
       <item>throw</item>
       <item>typeof</item>
       <item>const</item>
       <item>default</item>
    </list>
    <list name="functions">
       <item>escape</item>
       <item>isFinite</item>
       <item>isNaN</item>
       <item>Number</item>
       <item>parseFloat</item>
       <item>parseInt</item>
       <item>reload</item>
       <item>taint</item>
       <item>unescape</item>
       <item>untaint</item>
       <item>write</item>
    </list>
    <list name="objects">
       <item>Anchor</item>
       <item>Applet</item>
       <item>Area</item>
       <item>Array</item>
       <item>Boolean</item>
       <item>Button</item>
       <item>Checkbox</item>
       <item>Date</item>
       <item>document</item>
       <item>window</item>
       <item>Image</item>
       <item>FileUpload</item>
       <item>Form</item>
       <item>Frame</item>
       <item>Function</item>
       <item>Hidden</item>
       <item>Link</item>
       <item>MimeType</item>
       <item>Math</item>
       <item>Max</item>
       <item>Min</item>
       <item>Layer</item>
       <item>navigator</item>
       <item>Object</item>
       <item>Password</item>
       <item>Plugin</item>
       <item>Radio</item>
       <item>RegExp</item>
       <item>Reset</item>
       <item>Screen</item>
       <item>Select</item>
       <item>String</item>
       <item>Text</item>
       <item>Textarea</item>
       <item>this</item>
       <item>Window</item>
    </list>
    <list name="math">
       <item>abs</item>
       <item>acos</item>
       <item>asin</item>
       <item>atan</item>
       <item>atan2</item>
       <item>ceil</item>
       <item>cos</item>
       <item>ctg</item>
       <item>E</item>
       <item>exp</item>
       <item>floor</item>
       <item>LN2</item>
       <item>LN10</item>
       <item>log</item>
       <item>LOG2E</item>
       <item>LOG10E</item>
       <item>PI</item>
       <item>pow</item>
       <item>round</item>
       <item>sin</item>
       <item>sqrt</item>
       <item>SQRT1_2</item>
       <item>SQRT2</item>
       <item>tan</item>
    </list>
    <list name="events">
       <item>onAbort</item>
       <item>onBlur</item>
       <item>onChange</item>
       <item>onClick</item>
       <item>onError</item>
       <item>onFocus</item>
       <item>onLoad</item>
       <item>onMouseOut</item>
       <item>onMouseOver</item>
       <item>onReset</item>
       <item>onSelect</item>
       <item>onSubmit</item>
       <item>onUnload</item>
    </list>
    <list name="methods">
       <item>above</item>
       <item>action</item>
       <item>alinkColor</item>
       <item>alert</item>
       <item>anchor</item>
       <item>anchors</item>
       <item>appCodeName</item>
       <item>applets</item>
       <item>apply</item>
       <item>appName</item>
       <item>appVersion</item>
       <item>argument</item>
       <item>arguments</item>
       <item>arity</item>
       <item>availHeight</item>
       <item>availWidth</item>
       <item>back</item>
       <item>background</item>
       <item>below</item>
       <item>bgColor</item>
       <item>border</item>
       <item>big</item>
       <item>blink</item>
       <item>blur</item>
       <item>bold</item>
       <item>border</item>
       <item>call</item>
       <item>caller</item>
       <item>charAt</item>
       <item>charCodeAt</item>
       <item>checked</item>
       <item>clearInterval</item>
       <item>clearTimeout</item>
       <item>click</item>
       <item>clip</item>
       <item>close</item>
       <item>closed</item>
       <item>colorDepth</item>
       <item>complete</item>
       <item>compile</item>
       <item>constructor</item>
       <item>confirm</item>
       <item>cookie</item>
       <item>current</item>
       <item>cursor</item>
       <item>data</item>
       <item>defaultChecked</item>
       <item>defaultSelected</item>
       <item>defaultStatus</item>
       <item>defaultValue</item>
       <item>description</item>
       <item>disableExternalCapture</item>
       <item>domain</item>
       <item>elements</item>
       <item>embeds</item>
       <item>enabledPlugin</item>
       <item>enableExternalCapture</item>
       <item>encoding</item>
       <item>eval</item>
       <item>exec</item>
       <item>fgColor</item>
       <item>filename</item>
       <item>find</item>
       <item>fixed</item>
       <item>focus</item>
       <item>fontcolor</item>
       <item>fontsize</item>
       <item>form</item>
       <item>forms</item>
       <item>formName</item>
       <item>forward</item>
       <item>frames</item>
       <item>fromCharCode</item>
       <item>getDate</item>
       <item>getDay</item>
       <item>getHours</item>
       <item>getMiliseconds</item>
       <item>getMinutes</item>
       <item>getMonth</item>
       <item>getSeconds</item>
       <item>getSelection</item>
       <item>getTime</item>
       <item>getTimezoneOffset</item>
       <item>getUTCDate</item>
       <item>getUTCDay</item>
       <item>getUTCFullYear</item>
       <item>getUTCHours</item>
       <item>getUTCMilliseconds</item>
       <item>getUTCMinutes</item>
       <item>getUTCMonth</item>
       <item>getUTCSeconds</item>
       <item>getYear</item>
       <item>global</item>
       <item>go</item>
       <item>hash</item>
       <item>height</item>
       <item>history</item>
       <item>home</item>
       <item>host</item>
       <item>hostname</item>
       <item>href</item>
       <item>hspace</item>
       <item>ignoreCase</item>
       <item>images</item>
       <item>index</item>
       <item>indexOf</item>
       <item>innerHeight</item>
       <item>innerWidth</item>
       <item>input</item>
       <item>italics</item>
       <item>javaEnabled</item>
       <item>join</item>
       <item>language</item>
       <item>lastIndex</item>
       <item>lastIndexOf</item>
       <item>lastModified</item>
       <item>lastParen</item>
       <item>layers</item>
       <item>layerX</item>
       <item>layerY</item>
       <item>left</item>
       <item>leftContext</item>
       <item>length</item>
       <item>link</item>
       <item>linkColor</item>
       <item>links</item>
       <item>location</item>
       <item>locationbar</item>
       <item>load</item>
       <item>lowsrc</item>
       <item>match</item>
       <item>MAX_VALUE</item>
       <item>menubar</item>
       <item>method</item>
       <item>mimeTypes</item>
       <item>MIN_VALUE</item>
       <item>modifiers</item>
       <item>moveAbove</item>
       <item>moveBelow</item>
       <item>moveBy</item>
       <item>moveTo</item>
       <item>moveToAbsolute</item>
       <item>multiline</item>
       <item>name</item>
       <item>NaN</item>
       <item>NEGATIVE_INFINITY</item>
       <item>negative_infinity</item>
       <item>next</item>
       <item>open</item>
       <item>opener</item>
       <item>options</item>
       <item>outerHeight</item>
       <item>outerWidth</item>
       <item>pageX</item>
       <item>pageY</item>
       <item>pageXoffset</item>
       <item>pageYoffset</item>
       <item>parent</item>
       <item>parse</item>
       <item>pathname</item>
       <item>personalbar</item>
       <item>pixelDepth</item>
       <item>platform</item>
       <item>plugins</item>
       <item>pop</item>
       <item>port</item>
       <item>POSITIVE_INFINITY</item>
       <item>positive_infinity</item>
       <item>preference</item>
       <item>previous</item>
       <item>print</item>
       <item>prompt</item>
       <item>protocol</item>
       <item>prototype</item>
       <item>push</item>
       <item>referrer</item>
       <item>refresh</item>
       <item>releaseEvents</item>
       <item>reload</item>
       <item>replace</item>
       <item>reset</item>
       <item>resizeBy</item>
       <item>resizeTo</item>
       <item>reverse</item>
       <item>rightContext</item>
       <item>screenX</item>
       <item>screenY</item>
       <item>scroll</item>
       <item>scrollbar</item>
       <item>scrollBy</item>
       <item>scrollTo</item>
       <item>search</item>
       <item>select</item>
       <item>selected</item>
       <item>selectedIndex</item>
       <item>self</item>
       <item>setDate</item>
       <item>setHours</item>
       <item>setMinutes</item>
       <item>setMonth</item>
       <item>setSeconds</item>
       <item>setTime</item>
       <item>setTimeout</item>
       <item>setUTCDate</item>
       <item>setUTCDay</item>
       <item>setUTCFullYear</item>
       <item>setUTCHours</item>
       <item>setUTCMilliseconds</item>
       <item>setUTCMinutes</item>
       <item>setUTCMonth</item>
       <item>setUTCSeconds</item>
       <item>setYear</item>
       <item>shift</item>
       <item>siblingAbove</item>
       <item>siblingBelow</item>
       <item>small</item>
       <item>sort</item>
       <item>source</item>
       <item>splice</item>
       <item>split</item>
       <item>src</item>
       <item>status</item>
       <item>statusbar</item>
       <item>strike</item>
       <item>sub</item>
       <item>submit</item>
       <item>substr</item>
       <item>substring</item>
       <item>suffixes</item>
       <item>sup</item>
       <item>taintEnabled</item>
       <item>target</item>
       <item>test</item>
       <item>text</item>
       <item>title</item>
       <item>toGMTString</item>
       <item>toLocaleString</item>
       <item>toLowerCase</item>
       <item>toolbar</item>
       <item>toSource</item>
       <item>toString</item>
       <item>top</item>
       <item>toUpperCase</item>
       <item>toUTCString</item>
       <item>type</item>
       <item>URL</item>
       <item>unshift</item>
       <item>unwatch</item>
       <item>userAgent</item>
       <item>UTC</item>
       <item>value</item>
       <item>valueOf</item>
       <item>visibility</item>
       <item>vlinkColor</item>
       <item>vspace</item>
       <item>width</item>
       <item>watch</item>
       <item>which</item>
       <item>width</item>
       <item>write</item>
       <item>writeln</item>
       <item>x</item>
       <item>y</item>
       <item>zIndex</item>
     </list>
 <contexts>
   <context name="Start" attribute="Normal Text" lineEndContext="#stay">
     <IncludeRules context="FindXML" />
   </context>
 
   <context name="FindXML" attribute="Normal Text" lineEndContext="#stay">
     <DetectSpaces />
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
     <StringDetect attribute="CDATA" context="CDATA" String="&lt;![CDATA[" beginRegion="cdata" />
     <RegExpr attribute="Doctype" context="Doctype" String="&lt;!DOCTYPE\s+" beginRegion="doctype" />
     <RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:_-]*" beginRegion="pi" />
     <RegExpr attribute="Element" context="Element" String="&lt;&name;" beginRegion="element" />
     <IncludeRules context="FindEntityRefs" />
     <DetectIdentifier />
   </context>
 
   <context name="FindEntityRefs" attribute="Normal Text" lineEndContext="#stay">
     <RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
     <AnyChar attribute="Error" context="#stay" String="&amp;&lt;" />
   </context>
 
   <context name="FindPEntityRefs" attribute="Normal Text" lineEndContext="#stay">
     <RegExpr attribute="EntityRef" context="#stay" String="&entref;" />
     <RegExpr attribute="PEntityRef" context="#stay" String="%&name;;" />
     <AnyChar attribute="Error" context="#stay" String="&amp;%" />
   </context>
 
 
   <context name="Comment" attribute="Comment" lineEndContext="#stay">
     <DetectSpaces />
     <StringDetect attribute="Comment" context="#pop" String="--&gt;" endRegion="comment" />
     <RegExpr attribute="Error" context="#stay" String="-(-(?!-&gt;))+" />
     <IncludeRules context="##Alerts" />
     <DetectIdentifier />
   </context>
 
   <context name="PI" attribute="Normal Text" lineEndContext="#stay">
     <Detect2Chars attribute="Processing Instruction" context="#pop" char="?" char1="&gt;" endRegion="pi" />
   </context>
 
   <context name="Doctype" attribute="Normal Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="&gt;" endRegion="doctype" />
     <DetectChar attribute="Doctype" context="Doctype Internal Subset" char="[" beginRegion="int_subset" />
   </context>
 
   <context name="Doctype Internal Subset" attribute="Normal Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="]" endRegion="int_subset" />
     <RegExpr attribute="Doctype" context="Doctype Markupdecl" String="&lt;!(ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
     <StringDetect attribute="Comment" context="Comment" String="&lt;!--" beginRegion="comment" />
     <RegExpr attribute="Processing Instruction" context="PI" String="&lt;\?[\w:_-]*" beginRegion="pi" />
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
   <context name="Doctype Markupdecl" attribute="Normal Text" lineEndContext="#stay">
     <DetectChar attribute="Doctype" context="#pop" char="&gt;" />
     <DetectChar attribute="Value" context="Doctype Markupdecl DQ" char="&quot;" />
     <DetectChar attribute="Value" context="Doctype Markupdecl SQ" char="&apos;" />
   </context>
 
   <context name="Doctype Markupdecl DQ" attribute="Value" lineEndContext="#stay">
     <DetectChar attribute="Value" context="#pop" char="&quot;" />
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
   <context name="Doctype Markupdecl SQ" attribute="Value" lineEndContext="#stay">
     <DetectChar attribute="Value" context="#pop" char="&apos;" />
     <IncludeRules context="FindPEntityRefs" />
   </context>
 
   <context name="Element" attribute="Normal Text" lineEndContext="#stay">
     <Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" endRegion="element" />
     <DetectChar attribute="Element" context="El Content" char="&gt;" />
     <RegExpr attribute="Attribute" context="Attribute" String="^&name;" />
     <RegExpr attribute="Attribute" context="Attribute" String="\s+&name;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
   <context name="El Content" attribute="Normal Text" lineEndContext="#stay">
     <RegExpr attribute="Element" context="El End" String="&lt;/&name;" />
     <IncludeRules context="FindXML" />
   </context>
 
   <context name="El End" attribute="Normal Text" lineEndContext="#stay">
     <DetectChar attribute="Element" context="#pop#pop#pop" char="&gt;" endRegion="element" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
   <context name="Attribute" attribute="Normal Text" lineEndContext="#stay">
     <DetectChar attribute="Attribute" context="Value" char="=" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
   <context name="Value" attribute="Normal Text" lineEndContext="#stay">
     <DetectChar attribute="Value" context="Value DQ" char="&quot;" />
     <DetectChar attribute="Value" context="Value SQ" char="&apos;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>
 
   <context name="Value DQ" attribute="Value" lineEndContext="#stay">
     <DetectChar attribute="Value" context="#pop#pop#pop" char="&quot;" />
     <IncludeRules context="FindEntityRefs" />
   </context>
 
   <context name="Value SQ" attribute="Value" lineEndContext="#stay">
     <DetectChar attribute="Value" context="#pop#pop#pop" char="&apos;" />
     <IncludeRules context="FindEntityRefs" />
   </context>
 
   <context name="CDATA" attribute="Normal Text" lineEndContext="#stay">
      <StringDetect attribute="CDATA" context="#pop" String="]]&gt;" endRegion="cdata" />
      <StringDetect attribute="EntityRef" context="#stay" String="]]&amp;gt;" />
      <DetectSpaces/>
      <StringDetect attribute="Region Marker" context="region_marker" String="//BEGIN" beginRegion="Region1"/>
      <StringDetect attribute="Region Marker" context="region_marker" String="//END" endRegion="Region1"/>
      <keyword attribute="Keyword" context="#stay" String="keywords" />
      <keyword attribute="Function" context="#stay" String="functions" />
      <keyword attribute="Objects" context="#stay" String="objects" />
      <keyword attribute="Math" context="#stay" String="math" />
      <keyword attribute="Events" context="#stay" String="events" />
      <keyword attribute="Data Type" context="#stay" String="methods" />
      <DetectIdentifier/>
      <Float attribute="Float" context="#stay" />
      <Int attribute="Decimal" context="#stay" />
      <DetectChar attribute="String" context="String" char="&quot;"/>
      <DetectChar attribute="String" context="String 1" char="'"/>
      <Detect2Chars attribute="Comment" context="JSComment" char="/" char1="/"/>
      <Detect2Chars attribute="Comment" context="Multi/inline Comment" char="/" char1="*" beginRegion="Comment"/>
      <RegExpr attribute="Normal Text" context="(Internal regex catch)" String="[=?:]" />
      <RegExpr attribute="Normal Text" context="(Internal regex catch)" String="\(" />
      <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
      <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
      <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;"/>
   </context>
   
   <context attribute="String" lineEndContext="#pop" name="String">
      <DetectIdentifier/>
      <HlCStringChar attribute="String Char" context="#stay"/>
      <DetectChar attribute="String" context="#pop" char="&quot;"/>
   </context>
   <context attribute="String Char" lineEndContext="#pop" name="String 1">
      <DetectIdentifier/>
      <DetectChar attribute="String" context="String" char="&quot;"/>
      <DetectChar attribute="String Char" context="#pop" char="'"/>
   </context>
 
   <context attribute="Comment" lineEndContext="#pop" name="JSComment">
      <DetectSpaces />
      <IncludeRules context="##Alerts" />
      <DetectIdentifier />
   </context>
   <context attribute="Comment" lineEndContext="#stay" name="Multi/inline Comment">
      <IncludeRules context="##Alerts" />
      <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
   </context>
   
   <context attribute="Regular Expression" lineEndContext="#stay" name="Regular Expression">
      <RegExpr attribute="Regular Expression" context="#pop#pop#pop" String="/[ig]{0,2}" />
      <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\{[\d, ]+\}" />
      <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\\[bB]" />
      <RegExpr attribute="Pattern Character Class" context="#stay" String="\\[nrtvfDdSsWw]" />
      <DetectChar attribute="Pattern Character Class" context="(charclass caret first check)" char="[" />
      <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\\." />
      <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\$(?=/)" />
      <AnyChar attribute="Pattern Internal Operator" context="#stay" String="?+*()|" />
   </context>
   <context attribute="Normal Text" lineEndContext="#stay" name="(Internal regex catch)" fallthrough="true" fallthroughContext="#pop">
      <RegExpr attribute="Normal Text" context="#stay" String="\s*" />
      <RegExpr attribute="Regular Expression" context="#pop" String="//(?=;)" />
      <Detect2Chars attribute="Comment" context="JSComment" char="/" char1="/" />
      <Detect2Chars attribute="Comment" context="Multi/inline Comment" char="/" char1="*" />
      <DetectChar attribute="Regular Expression" context="(regex caret first check)" char="/" />
   </context>
   <context attribute="Pattern Character Class" lineEndContext="#stay" name="Regular Expression Character Class">
      <RegExpr attribute="Pattern Character Class" context="#stay" String="\\[\[\]]" />
      <DetectChar attribute="Pattern Character Class" context="#pop#pop" char="]" />
   </context>
   <context attribute="Pattern Internal Operator" lineEndContext="#pop" name="(regex caret first check)" fallthrough="true" fallthroughContext="Regular Expression">
      <DetectChar attribute="Pattern Internal Operator" context="Regular Expression" char="^" />
   </context>
   <context attribute="Pattern Internal Operator" lineEndContext="#pop" name="(charclass caret first check)" fallthrough="true" fallthroughContext="Regular Expression Character Class">
      <DetectChar attribute="Pattern Internal Operator" context="Regular Expression Character Class" char="^" />
   </context>
   
   <context name="region_marker" attribute="Region Marker" lineEndContext="#pop" >
      <DetectIdentifier />
      <DetectSpaces />
   </context>
 
 </contexts>
 <itemDatas>
   <itemData name="Normal Text" defStyleNum="dsNormal" />
   <itemData name="Comment" defStyleNum="dsComment" />
   <itemData name="CDATA" defStyleNum="dsBaseN" bold="1" />
   <itemData name="Processing Instruction" defStyleNum="dsKeyword" />
   <itemData name="Doctype" defStyleNum="dsDataType" bold="1" />
   <itemData name="Element" defStyleNum="dsKeyword" />
   <itemData name="Attribute" defStyleNum="dsOthers" />
   <itemData name="Value" defStyleNum="dsString" />
   <itemData name="EntityRef" defStyleNum="dsDecVal" />
   <itemData name="PEntityRef" defStyleNum="dsDecVal" />
   <itemData name="Error" defStyleNum="dsError" />
 
   <itemData name="Keyword"      defStyleNum="dsKeyword"/>
   <itemData name="Function" defStyleNum="dsFunction"/>
   <itemData name="Objects" defStyleNum="dsKeyword" color="#008000" selColor="#00ffff" bold="0" italic="0"/>
   <itemData name="Math" defStyleNum="dsKeyword" color="#DBA716" selColor="#00ffff" bold="0" italic="0"/>
   <itemData name="Events" defStyleNum="dsKeyword" color="#F766D5" selColor="#00ffff" bold="0" italic="0"/>
   <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="Symbol"       defStyleNum="dsNormal"/>
   <itemData name="Regular Expression" defStyleNum="dsOthers"   />
   <itemData name="Pattern Internal Operator" defStyleNum="dsFloat" />
   <itemData name="Pattern Character Class" defStyleNum="dsBaseN" />
   <itemData name="Region Marker" defStyleNum="dsRegionMarker" />
 </itemDatas>
 
 </highlighting>
 <general>
   <comments>
     <comment name="multiLine" start="&lt;!--" end="--&gt;" />
     <comment name="singleLine" start="//" />
     <comment name="multiLine" start="/*" end="*/" />
   </comments>
-  <indentation mode="xml" />
   <keywords casesensitive="1" />
 </general>
 </language>