From 51d667766b2b11b4da90a942bd23bbcecfa82f4f Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Tue, 20 Jun 2023 09:23:28 -0700
Subject: [PATCH] Update syntax definitions from upstream.

---
 skylighting-core/xml/abc.xml              |   2 +-
 skylighting-core/xml/actionscript.xml     |   2 +-
 skylighting-core/xml/ada.xml              |   2 +-
 skylighting-core/xml/agda.xml             |   2 +-
 skylighting-core/xml/alert.xml            |   6 +-
 skylighting-core/xml/apache.xml           |   2 +-
 skylighting-core/xml/asn1.xml             |   2 +-
 skylighting-core/xml/asp.xml              |   2 +-
 skylighting-core/xml/ats.xml              |   2 +-
 skylighting-core/xml/awk.xml              |   2 +-
 skylighting-core/xml/bash.xml             |   9 +-
 skylighting-core/xml/bibtex.xml           |   2 +-
 skylighting-core/xml/c.xml                |  33 +-
 skylighting-core/xml/changelog.xml        |   2 +-
 skylighting-core/xml/clojure.xml          |  75 +--
 skylighting-core/xml/cmake.xml            |  97 +--
 skylighting-core/xml/coffee.xml           |   2 +-
 skylighting-core/xml/coldfusion.xml       |  47 +-
 skylighting-core/xml/comments.xml         |   2 +-
 skylighting-core/xml/commonlisp.xml       |   2 +-
 skylighting-core/xml/cpp.xml              |   2 +-
 skylighting-core/xml/cs.xml               |   2 +-
 skylighting-core/xml/css.xml              |   2 +-
 skylighting-core/xml/curry.xml            |   2 +-
 skylighting-core/xml/d.xml                |   2 +-
 skylighting-core/xml/dart.xml             |  16 +-
 skylighting-core/xml/diff.xml             |  10 +-
 skylighting-core/xml/djangotemplate.xml   |   2 +-
 skylighting-core/xml/dockerfile.xml       |   6 +-
 skylighting-core/xml/dot.xml              |   2 +-
 skylighting-core/xml/doxygen.xml          |   7 +-
 skylighting-core/xml/dtd.xml              |   2 +-
 skylighting-core/xml/eiffel.xml           |   9 +-
 skylighting-core/xml/elixir.xml           |   9 +-
 skylighting-core/xml/elm.xml              |   2 +-
 skylighting-core/xml/email.xml            |   2 +-
 skylighting-core/xml/erlang.xml           |   2 +-
 skylighting-core/xml/fasm.xml             |   2 +-
 skylighting-core/xml/fortran-fixed.xml    |   2 +-
 skylighting-core/xml/fortran-free.xml     |   2 +-
 skylighting-core/xml/fsharp.xml           |   2 +-
 skylighting-core/xml/gcc.xml              |   2 +-
 skylighting-core/xml/glsl.xml             |   2 +-
 skylighting-core/xml/gnuassembler.xml     |   2 +-
 skylighting-core/xml/go.xml               |   2 +-
 skylighting-core/xml/graphql.xml          |   2 +-
 skylighting-core/xml/groovy.xml           |   2 +-
 skylighting-core/xml/hamlet.xml           |   2 +-
 skylighting-core/xml/haskell.xml          |   2 +-
 skylighting-core/xml/haxe.xml             |   2 +-
 skylighting-core/xml/html.xml             |   2 +-
 skylighting-core/xml/idris.xml            |   2 +-
 skylighting-core/xml/ini.xml              |   2 +-
 skylighting-core/xml/isocpp.xml           |   2 +-
 skylighting-core/xml/j.xml                |   2 +-
 skylighting-core/xml/java.xml             |   2 +-
 skylighting-core/xml/javadoc.xml          |   2 +-
 skylighting-core/xml/javascript-react.xml |   2 +-
 skylighting-core/xml/javascript.xml       |   2 +-
 skylighting-core/xml/json.xml             |   2 +-
 skylighting-core/xml/jsp.xml              |   2 +-
 skylighting-core/xml/julia.xml            | 759 ++--------------------
 skylighting-core/xml/kotlin.xml           |   2 +-
 skylighting-core/xml/latex.xml            |  10 +-
 skylighting-core/xml/lex.xml              |   2 +-
 skylighting-core/xml/lilypond.xml         |   2 +-
 skylighting-core/xml/literate-curry.xml   |   2 +-
 skylighting-core/xml/literate-haskell.xml |   2 +-
 skylighting-core/xml/llvm.xml             |   2 +-
 skylighting-core/xml/lua.xml              |   2 +-
 skylighting-core/xml/m4.xml               |   2 +-
 skylighting-core/xml/makefile.xml         |  37 +-
 skylighting-core/xml/mandoc.xml           |   2 +-
 skylighting-core/xml/markdown.xml         | 112 ++--
 skylighting-core/xml/mathematica.xml      |   2 +-
 skylighting-core/xml/matlab.xml           |   2 +-
 skylighting-core/xml/maxima.xml           |   2 +-
 skylighting-core/xml/mediawiki.xml        |   2 +-
 skylighting-core/xml/metafont.xml         |  26 +-
 skylighting-core/xml/mips.xml             |   2 +-
 skylighting-core/xml/modelines.xml        |   2 +-
 skylighting-core/xml/modula-2.xml         |   2 +-
 skylighting-core/xml/modula-3.xml         |   2 +-
 skylighting-core/xml/monobasic.xml        |   2 +-
 skylighting-core/xml/mustache.xml         |   2 +-
 skylighting-core/xml/nasm.xml             |   2 +-
 skylighting-core/xml/nim.xml              |   2 +-
 skylighting-core/xml/nix.xml              |   2 +-
 skylighting-core/xml/noweb.xml            |   2 +-
 skylighting-core/xml/objectivec.xml       |   2 +-
 skylighting-core/xml/objectivecpp.xml     |   2 +-
 skylighting-core/xml/ocaml.xml            |   2 +-
 skylighting-core/xml/octave.xml           |   2 +-
 skylighting-core/xml/opencl.xml           |   2 +-
 skylighting-core/xml/orgmode.xml          |   2 +-
 skylighting-core/xml/pascal.xml           |   2 +-
 skylighting-core/xml/perl.xml             |   2 +-
 skylighting-core/xml/php.xml              |   2 +-
 skylighting-core/xml/pike.xml             |   2 +-
 skylighting-core/xml/postscript.xml       |   2 +-
 skylighting-core/xml/povray.xml           |   2 +-
 skylighting-core/xml/powershell.xml       |   2 +-
 skylighting-core/xml/prolog.xml           |   2 +-
 skylighting-core/xml/protobuf.xml         |   2 +-
 skylighting-core/xml/pure.xml             |   2 +-
 skylighting-core/xml/purebasic.xml        |   2 +-
 skylighting-core/xml/purescript.xml       |   2 +-
 skylighting-core/xml/python.xml           |   2 +-
 skylighting-core/xml/qml.xml              |  15 +-
 skylighting-core/xml/r.xml                |   2 +-
 skylighting-core/xml/raku.xml             |   2 +-
 skylighting-core/xml/relaxng.xml          |   2 +-
 skylighting-core/xml/relaxngcompact.xml   |   2 +-
 skylighting-core/xml/rest.xml             |   2 +-
 skylighting-core/xml/rhtml.xml            |   2 +-
 skylighting-core/xml/roff.xml             |   9 +-
 skylighting-core/xml/ruby.xml             |  12 +-
 skylighting-core/xml/rust.xml             |   2 +-
 skylighting-core/xml/sass.xml             |   6 +-
 skylighting-core/xml/scala.xml            |   2 +-
 skylighting-core/xml/scheme.xml           |   2 +-
 skylighting-core/xml/sci.xml              |   2 +-
 skylighting-core/xml/scss.xml             |   2 +-
 skylighting-core/xml/sed.xml              |   2 +-
 skylighting-core/xml/sgml.xml             |   2 +-
 skylighting-core/xml/sml.xml              |   2 +-
 skylighting-core/xml/spdx-comments.xml    |   2 +-
 skylighting-core/xml/sql-mysql.xml        |   2 +-
 skylighting-core/xml/sql-postgresql.xml   |   2 +-
 skylighting-core/xml/sql.xml              |   2 +-
 skylighting-core/xml/stan.xml             |   2 +-
 skylighting-core/xml/stata.xml            |   2 +-
 skylighting-core/xml/swift.xml            |   2 +-
 skylighting-core/xml/systemverilog.xml    |   2 +-
 skylighting-core/xml/tcl.xml              |   2 +-
 skylighting-core/xml/tcsh.xml             |   2 +-
 skylighting-core/xml/texinfo.xml          |   2 +-
 skylighting-core/xml/toml.xml             | 329 +++++-----
 skylighting-core/xml/typescript.xml       |   6 +-
 skylighting-core/xml/verilog.xml          |   2 +-
 skylighting-core/xml/vhdl.xml             |   2 +-
 skylighting-core/xml/xml.xml              |   4 +-
 skylighting-core/xml/xorg.xml             |   2 +-
 skylighting-core/xml/xslt.xml             |   2 +-
 skylighting-core/xml/xul.xml              |   2 +-
 skylighting-core/xml/yacc.xml             |   2 +-
 skylighting-core/xml/yaml.xml             |   2 +-
 skylighting-core/xml/zsh.xml              |   2 +-
 148 files changed, 640 insertions(+), 1257 deletions(-)

diff --git a/skylighting-core/xml/abc.xml b/skylighting-core/xml/abc.xml
index 47d7648e1..c32891843 100644
--- a/skylighting-core/xml/abc.xml
+++ b/skylighting-core/xml/abc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- Andrea Primiani - primiani at dag dot it
  	version1.10 - 12 december 2005 -->
 <language name="ABC" version="8" kateversion="5.0" section="Other" extensions="*.abc;*.ABC" mimetype="text/vnd.abc" casesensitive="1" author="Andrea Primiani (primiani@dag.it)" license="LGPL">
diff --git a/skylighting-core/xml/actionscript.xml b/skylighting-core/xml/actionscript.xml
index c49b10923..06641ca8c 100644
--- a/skylighting-core/xml/actionscript.xml
+++ b/skylighting-core/xml/actionscript.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="ActionScript 2.0" version="9" kateversion="5.62" section="Sources" extensions="*.as" mimetype="text/x-actionscript" license="LGPL" author="Aaron Miller (armantic101@gmail.com)">
   <highlighting>
     
diff --git a/skylighting-core/xml/ada.xml b/skylighting-core/xml/ada.xml
index bf5cd475e..553e37046 100644
--- a/skylighting-core/xml/ada.xml
+++ b/skylighting-core/xml/ada.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Ada"
           version="6"
           kateversion="5.0"
diff --git a/skylighting-core/xml/agda.xml b/skylighting-core/xml/agda.xml
index 52f5a4f07..194aae552 100644
--- a/skylighting-core/xml/agda.xml
+++ b/skylighting-core/xml/agda.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"[
+<!DOCTYPE language[
   <!ENTITY charsdelim "_;.&#34;(){}@">
   <!ENTITY wordsep "(?=[&charsdelim;]|\s|$)">
 ]>
diff --git a/skylighting-core/xml/alert.xml b/skylighting-core/xml/alert.xml
index 8189dd2b1..b6c290b0b 100644
--- a/skylighting-core/xml/alert.xml
+++ b/skylighting-core/xml/alert.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language version="7" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhaumann@kde.org)" license="MIT" hidden="true">
+<!DOCTYPE language>
+<language version="8" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhaumann@kde.org)" license="MIT" hidden="true">
   <highlighting>
     <list name="alerts_hi">
       <item>ALERT</item>
@@ -36,6 +36,8 @@
         <WordDetect attribute="Region Marker" context="#stay" String="END" endRegion="AlertRegion2" />
         <keyword attribute="Alert Level 1" context="#stay" String="alerts_hi" />
         <keyword attribute="Alert Level 2" context="#stay" String="alerts_mid" />
+        <!-- Some (Python?) linters use `noqa:` (small case w/ colon) -->
+        <WordDetect attribute="Alert Level 2" context="#stay" String="noqa:" />
         <keyword attribute="Alert Level 3" context="#stay" String="alerts_lo" />
       </context>
     </contexts>
diff --git a/skylighting-core/xml/apache.xml b/skylighting-core/xml/apache.xml
index 45285835c..69381ea91 100644
--- a/skylighting-core/xml/apache.xml
+++ b/skylighting-core/xml/apache.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 
 <!-- Changelog:
 
diff --git a/skylighting-core/xml/asn1.xml b/skylighting-core/xml/asn1.xml
index 411ff64de..7446bd8de 100644
--- a/skylighting-core/xml/asn1.xml
+++ b/skylighting-core/xml/asn1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
         You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
         This is a template for the XML format used for syntax highlight descriptions
diff --git a/skylighting-core/xml/asp.xml b/skylighting-core/xml/asp.xml
index d84a877cc..8e44b6d26 100644
--- a/skylighting-core/xml/asp.xml
+++ b/skylighting-core/xml/asp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE  language SYSTEM "language.dtd">
+<!DOCTYPE  language>
 <language name="ASP" version="9" kateversion="5.44" section="Markup" extensions="*.asp;" mimetype="text/x-asp-src;text/x-asp-src" author="Antonio Salazar (savedfastcool@gmail.com)" license="LGPL">
     <highlighting>
         <list name="control structures">
diff --git a/skylighting-core/xml/ats.xml b/skylighting-core/xml/ats.xml
index 7a029b5e6..ad9d648be 100644
--- a/skylighting-core/xml/ats.xml
+++ b/skylighting-core/xml/ats.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 <!-- Regular expression constants: -->
 <!ENTITY LETTER "A-Za-z\xc0-\xd6\xd8-\xf6\xf8-\xff">                <!-- Latin-1 letters. -->
diff --git a/skylighting-core/xml/awk.xml b/skylighting-core/xml/awk.xml
index c66f60841..5502bbd6a 100644
--- a/skylighting-core/xml/awk.xml
+++ b/skylighting-core/xml/awk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="AWK" version="6" kateversion="5.0" section="Scripts"
   extensions="*.awk" mimetype="text/x-awk" indenter="cstyle"
   license="LGPL">
diff --git a/skylighting-core/xml/bash.xml b/skylighting-core/xml/bash.xml
index 84d0cf841..8e819b62b 100644
--- a/skylighting-core/xml/bash.xml
+++ b/skylighting-core/xml/bash.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY tab      "&#009;">
     <!ENTITY funcname "([^&_fragpathseps;}=#$]|[+!@](?!\())([^&_fragpathseps;}=$]*+([+!@](?!\())?+)*+">
@@ -66,7 +66,7 @@
 
 <language
     name="Bash"
-    version="46"
+    version="47"
     kateversion="5.79"
     section="Scripts"
     extensions="*.sh;*.bash;*.ebuild;*.eclass;*.exlib;*.exheres-0;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD"
@@ -1270,6 +1270,7 @@
       <context attribute="Variable" lineEndContext="#pop" name="VarBracePrefix">
         <DetectIdentifier attribute="Variable" context="#pop!VarBracePrefixSuffix"/>
         <Int attribute="Variable" context="#pop!VarBracePrefixSuffix"/>
+        <AnyChar attribute="Parameter Expansion Operator" context="#pop!VarBracePrefixSharp" String="@*#"/>
       </context>
       <context attribute="Variable" lineEndContext="#pop" name="VarBracePrefixSuffix" fallthroughContext="#pop!VarError">
         <DetectChar attribute="Parameter Expansion" context="#pop" char="}"/>
@@ -1277,6 +1278,10 @@
         <StringDetect attribute="Parameter Expansion Operator" context="#stay" String="[@]"/>
         <StringDetect attribute="Parameter Expansion Operator" context="#stay" String="[*]"/>
       </context>
+      <context attribute="Variable" lineEndContext="#pop" name="VarBracePrefixSharp" fallthroughContext="#pop!VarError">
+        <DetectChar attribute="Parameter Expansion" context="#pop" char="}"/>
+        <DetectChar attribute="Parameter Expansion Operator" char="#"/>
+      </context>
 
       <!-- VarBrace is called as soon as ${ or ${# are encoutered -->
       <context attribute="Variable" lineEndContext="#stay" name="VarBrace" fallthroughContext="#pop!VarError">
diff --git a/skylighting-core/xml/bibtex.xml b/skylighting-core/xml/bibtex.xml
index e82b692b7..189843507 100644
--- a/skylighting-core/xml/bibtex.xml
+++ b/skylighting-core/xml/bibtex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 	  [
 	  <!ENTITY stringVariable   "[a-zA-Z0-9\-]+">
 	  <!ENTITY fieldFormat    	"[a-zA-Z0-9\-_\.]+">
diff --git a/skylighting-core/xml/c.xml b/skylighting-core/xml/c.xml
index 7b8cd454d..4ee163193 100644
--- a/skylighting-core/xml/c.xml
+++ b/skylighting-core/xml/c.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY int "(?:[0-9](?:'?[0-9]++)*+)">
     <!ENTITY hex_int "(?:[0-9A-Fa-f](?:'?[0-9A-Fa-f]++)*+)">
@@ -15,7 +15,7 @@
     <!ENTITY pphash "&ispphash;\s*">
 ]>
 <language name="C" section="Sources"
-          version="17" kateversion="5.79"
+          version="18" kateversion="5.79"
           indenter="cstyle"
           extensions="*.c;*.C;*.h"
           mimetype="text/x-csrc;text/x-c++src;text/x-chdr"
@@ -45,14 +45,19 @@
     </list>
 
     <list name="keywords">
+      <item>alignas</item> <!-- C23 -->
+      <item>alignof</item> <!-- C23 -->
       <item>auto</item>
       <item>constexpr</item> <!-- C23 -->
       <item>enum</item>
       <item>extern</item>
+      <item>false</item> <!-- C23 -->
       <item>inline</item>
       <item>nullptr</item> <!-- C23 -->
       <item>sizeof</item>
+      <item>static_assert</item> <!-- C23 -->
       <item>struct</item>
+      <item>true</item> <!-- C23 -->
       <item>typedef</item>
       <item>typeof</item> <!-- C23 -->
       <item>typeof_unqual</item> <!-- C23 -->
@@ -77,22 +82,18 @@
     </list>
 
     <list name="types">
+      <item>bool</item> <!-- C23 -->
       <item>char</item>
       <item>char16_t</item>
       <item>char32_t</item>
-      <item>const</item>
       <item>double</item>
       <item>float</item>
       <item>int</item>
       <item>long</item>
-      <item>register</item>
-      <item>restrict</item>
       <item>short</item>
       <item>signed</item>
-      <item>static</item>
       <item>unsigned</item>
       <item>void</item>
-      <item>volatile</item>
       <item>int8_t</item>
       <item>int16_t</item>
       <item>int32_t</item>
@@ -127,12 +128,12 @@
       <item>ptrdiff_t</item>
       <item>sig_atomic_t</item>
       <item>wint_t</item>
-      <item>_BitInt</item>
+      <item>_BitInt</item> <!-- C23 -->
       <item>_Bool</item>
       <item>bool</item>
-      <item>_Decimal32</item>
-      <item>_Decimal64</item>
-      <item>_Decimal128</item>
+      <item>_Decimal32</item> <!-- C23 -->
+      <item>_Decimal64</item> <!-- C23 -->
+      <item>_Decimal128</item> <!-- C23 -->
       <item>_Complex</item>
       <item>complex</item>
       <item>_Imaginary</item>
@@ -143,6 +144,14 @@
       <item>fpos_t</item>
       <item>time_t</item>
       <item>max_align_t</item>
+
+      <!-- modifiers -->
+      <item>const</item>
+      <item>register</item>
+      <item>restrict</item>
+      <item>static</item>
+      <item>thread_local</item> <!-- C23 -->
+      <item>volatile</item>
     </list>
 
     <list name="preprocessor">
@@ -483,7 +492,7 @@
       <context name="IntSuffix" attribute="Error" lineEndContext="#pop#pop" fallthroughContext="NumericSuffixError">
         <DetectChar attribute="Error" context="#stay" char="'" />
         <!-- https://en.cppreference.com/w/c/language/integer_constant#The_type_of_the_integer_constant -->
-        <RegExpr attribute="Standard Suffix" context="NumericSuffixError" String="([Uu](LL?|ll?)?|(LL?|ll?)[Uu]?|wb|WB)\b"/>
+        <RegExpr attribute="Standard Suffix" context="NumericSuffixError" String="([Uu](LL?|ll?|wb|WB)?|(LL?|ll?|wb|WB)[Uu]?)\b"/>
       </context>
 
       <context name="FloatSuffix" attribute="Error" lineEndContext="#pop#pop" fallthroughContext="NumericSuffixError">
diff --git a/skylighting-core/xml/changelog.xml b/skylighting-core/xml/changelog.xml
index 4dea40cee..e2be27f67 100644
--- a/skylighting-core/xml/changelog.xml
+++ b/skylighting-core/xml/changelog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="ChangeLog" version="4" kateversion="2.4" section="Other" extensions="ChangeLog" mimetype="" author="Dominik Haumann (dhaumann@kde.org)" license="MIT">
   <highlighting>
     <contexts>
diff --git a/skylighting-core/xml/clojure.xml b/skylighting-core/xml/clojure.xml
index f2096f723..c88cdb767 100644
--- a/skylighting-core/xml/clojure.xml
+++ b/skylighting-core/xml/clojure.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
   This file is part of KDE's kate project.
 
@@ -22,7 +22,7 @@
  * Boston, MA  02110-1301, USA.                                       *
  **********************************************************************
  -->
-<language version="15" kateversion="5.0" name="Clojure" section="Sources" extensions="*.clj;*.cljs;*.cljc" mimetype="" author="Dominik Haumann [lisp] modified for clojure by Caspar Hasenclever" license="LGPLv2+">
+<language version="16" kateversion="5.0" name="Clojure" section="Sources" extensions="*.clj;*.cljs;*.cljc" mimetype="" author="Dominik Haumann [lisp] modified for clojure by Caspar Hasenclever" license="LGPLv2+">
   <highlighting>
     <list name="definitions">
       <item>def</item>
@@ -703,14 +703,6 @@
       <item>true</item>
     </list>
     <contexts>
-      <context name="Level0" attribute="Normal" lineEndContext="#stay">
-        <DetectChar attribute="Brackets1" context="Level1" char="("/>
-        <Detect2Chars attribute="Brackets1" context="Level1" char="'" char1="("/>
-        <Detect2Chars attribute="Brackets1" context="Level1" char="`" char1="("/>
-        <Detect2Chars attribute="Brackets1" context="Level1" char="#" char1="("/>
-        <Detect2Chars attribute="Brackets1" context="Level1" char="@" char1="("/>
-        <IncludeRules context="Default" />
-      </context>
       <context name="Default" attribute="Normal" lineEndContext="#stay">
         <DetectChar attribute="Comment" context="Comment" char=";"/>
         <Detect2Chars attribute="Comment" context="#stay" char="#" char1="_"/>
@@ -720,6 +712,7 @@
         <Detect2Chars attribute="BracketsSet" context="BracketsSet" char="#" char1="{"/>
         <Detect2Chars attribute="BracketsMeta" context="BracketsMeta" char="^" char1="{"/>
         <DetectChar attribute="BracketsMap" context="BracketsMap" char="{"/>
+        <AnyChar attribute="Brackets" context="#stay" String="()"/>
         <AnyChar attribute="BracketsSquare" context="#stay" String="[]"/>
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <RegExpr attribute="Variable" context="#stay" String="#'[^\s\(\)\{\}\[\]]+|%[0-9]*"/>
@@ -734,7 +727,6 @@
         <RegExpr attribute="Error" context="#stay" String="(3[7-9]|[0-9]*[4-9][0-9]+)[rR][0-9a-zA-Z]+"/>
         <Float attribute="Float" context="Float Suffixes"/>
         <Int attribute="Decimal" context="Int Suffixes"/>
-        <DetectChar attribute="Brackets1" context="Level1" char="("/>
       </context>
       <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
         <DetectChar attribute="Float" context="#pop" char="M"/>
@@ -783,60 +775,6 @@
         <DetectChar attribute="BracketsMap" context="#pop" char="}" />
         <IncludeRules context="Default" />
       </context>
-      <context name="Level1" attribute="Normal" lineEndContext="#stay">
-        <DetectChar attribute="Brackets2" context="Level2" char="("/>
-        <Detect2Chars attribute="Brackets2" context="Level2" char="'" char1="("/>
-        <Detect2Chars attribute="Brackets2" context="Level2" char="`" char1="("/>
-        <Detect2Chars attribute="Brackets2" context="Level2" char="#" char1="("/>
-        <Detect2Chars attribute="Brackets2" context="Level2" char="@" char1="("/>
-        <DetectChar attribute="Brackets1" context="#pop" char=")" />
-        <IncludeRules context="Default" />
-      </context>
-      <context name="Level2" attribute="Normal" lineEndContext="#stay">
-        <DetectChar attribute="Brackets3" context="Level3" char="("/>
-        <Detect2Chars attribute="Brackets3" context="Level3" char="'" char1="("/>
-        <Detect2Chars attribute="Brackets3" context="Level3" char="`" char1="("/>
-        <Detect2Chars attribute="Brackets3" context="Level3" char="#" char1="("/>
-        <Detect2Chars attribute="Brackets3" context="Level3" char="@" char1="("/>
-        <DetectChar attribute="Brackets2" context="#pop" char=")" />
-        <IncludeRules context="Default" />
-      </context>
-      <context name="Level3" attribute="Normal" lineEndContext="#stay">
-        <DetectChar attribute="Brackets4" context="Level4" char="("/>
-        <Detect2Chars attribute="Brackets4" context="Level4" char="'" char1="("/>
-        <Detect2Chars attribute="Brackets4" context="Level4" char="`" char1="("/>
-        <Detect2Chars attribute="Brackets4" context="Level4" char="#" char1="("/>
-        <Detect2Chars attribute="Brackets4" context="Level4" char="@" char1="("/>
-        <DetectChar attribute="Brackets3" context="#pop" char=")" />
-        <IncludeRules context="Default" />
-      </context>
-      <context name="Level4" attribute="Normal" lineEndContext="#stay">
-        <DetectChar attribute="Brackets5" context="Level5" char="("/>
-        <Detect2Chars attribute="Brackets5" context="Level5" char="'" char1="("/>
-        <Detect2Chars attribute="Brackets5" context="Level5" char="`" char1="("/>
-        <Detect2Chars attribute="Brackets5" context="Level5" char="#" char1="("/>
-        <Detect2Chars attribute="Brackets5" context="Level5" char="@" char1="("/>
-        <DetectChar attribute="Brackets4" context="#pop" char=")" />
-        <IncludeRules context="Default" />
-      </context>
-      <context name="Level5" attribute="Normal" lineEndContext="#stay">
-        <DetectChar attribute="Brackets6" context="Level6" char="("/>
-        <Detect2Chars attribute="Brackets6" context="Level6" char="'" char1="("/>
-        <Detect2Chars attribute="Brackets6" context="Level6" char="`" char1="("/>
-        <Detect2Chars attribute="Brackets6" context="Level6" char="#" char1="("/>
-        <Detect2Chars attribute="Brackets6" context="Level6" char="@" char1="("/>
-        <DetectChar attribute="Brackets5" context="#pop" char=")" />
-        <IncludeRules context="Default" />
-      </context>
-      <context name="Level6" attribute="Normal" lineEndContext="#stay">
-        <DetectChar attribute="Brackets1" context="Level1" char="("/>
-        <Detect2Chars attribute="Brackets1" context="Level1" char="'" char1="("/>
-        <Detect2Chars attribute="Brackets1" context="Level1" char="`" char1="("/>
-        <Detect2Chars attribute="Brackets1" context="Level1" char="#" char1="("/>
-        <Detect2Chars attribute="Brackets1" context="Level1" char="@" char1="("/>
-        <DetectChar attribute="Brackets6" context="#pop" char=")" />
-        <IncludeRules context="Default" />
-      </context>
     </contexts>
     <itemDatas>
       <itemData name="Normal" defStyleNum="dsNormal" spellChecking="false"/>
@@ -860,13 +798,8 @@
       <itemData name="BracketsSet" defStyleNum="dsNormal" color="#0000ff" selColor="#00ff00"/>
       <itemData name="BracketsMeta" defStyleNum="dsNormal" color="#0000ff" selColor="#00ff00" bold="1" italic="0"/>
       <itemData name="BracketsMap" defStyleNum="dsNormal" color="#33ab33" selColor="#219921"/>
+      <itemData name="Brackets"    defStyleNum="dsNormal" color="#0000ff" selColor="#00ff00" bold="1" italic="0"/>
       <itemData name="BracketsSquare" defStyleNum="dsNormal" color="#3333ff" selColor="#3333aa"/>
-      <itemData name="Brackets1" defStyleNum="dsNormal" color="#ff0000" selColor="#ffaa00" bold="0" italic="0"/>
-      <itemData name="Brackets2" defStyleNum="dsNormal" color="#ff8800" selColor="#ffff00" bold="0" italic="0"/>
-      <itemData name="Brackets3" defStyleNum="dsNormal" color="#888800" selColor="#888888" bold="0" italic="0"/>
-      <itemData name="Brackets4" defStyleNum="dsNormal" color="#008800" bold="0" italic="0"/>
-      <itemData name="Brackets5" defStyleNum="dsNormal" color="#3689e6" bold="0" italic="0"/>
-      <itemData name="Brackets6" defStyleNum="dsNormal" color="#a100a1" bold="0" italic="0"/>
     </itemDatas>
   </highlighting>
   <general>
diff --git a/skylighting-core/xml/cmake.xml b/skylighting-core/xml/cmake.xml
index 053d983c3..2a84431a5 100644
--- a/skylighting-core/xml/cmake.xml
+++ b/skylighting-core/xml/cmake.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!-- NOTE See https://cmake.org/cmake/help/latest/manual/cmake-language.7.html#variable-references -->
   <!ENTITY var_ref_re "[/\.\+\-_0-9A-Za-z]+">
@@ -25,7 +25,7 @@
 
 <language
     name="CMake"
-    version="44"
+    version="45"
     kateversion="5.0"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
@@ -729,6 +729,7 @@
       <item>CHECK_FAIL</item>
       <item>CHECK_PASS</item>
       <item>CHECK_START</item>
+      <item>CONFIGURE_LOG</item>
       <item>DEBUG</item>
       <item>DEPRECATION</item>
       <item>FATAL_ERROR</item>
@@ -937,6 +938,7 @@
     <list name="enable_language_sargs">
       <item>ASM</item>
       <item>ASM-ATT</item>
+      <item>ASM_MARMASM</item>
       <item>ASM_MASM</item>
       <item>ASM_NASM</item>
       <item>C</item>
@@ -1214,7 +1216,9 @@
       <item>COPY_FILE_ERROR</item>
       <item>LINK_LIBRARIES</item>
       <item>LINK_OPTIONS</item>
+      <item>LOG_DESCRIPTION</item>
       <item>NO_CACHE</item>
+      <item>NO_LOG</item>
       <item>OUTPUT_VARIABLE</item>
       <item>PROJECT</item>
       <item>SOURCES</item>
@@ -1234,7 +1238,9 @@
       <item>COPY_FILE_ERROR</item>
       <item>LINK_LIBRARIES</item>
       <item>LINK_OPTIONS</item>
+      <item>LOG_DESCRIPTION</item>
       <item>NO_CACHE</item>
+      <item>NO_LOG</item>
       <item>OUTPUT_VARIABLE</item>
       <item>RUN_OUTPUT_STDERR_VARIABLE</item>
       <item>RUN_OUTPUT_STDOUT_VARIABLE</item>
@@ -1601,6 +1607,7 @@
       <item>HTTP_USERNAME</item>
       <item>INACTIVITY_TIMEOUT</item>
       <item>INDEPENDENT_STEP_TARGETS</item>
+      <item>INSTALL_BYPRODUCTS</item>
       <item>INSTALL_COMMAND</item>
       <item>INSTALL_DIR</item>
       <item>LIST_SEPARATOR</item>
@@ -2529,9 +2536,12 @@
       <item>CMAKE_VS_NUGET_PACKAGE_RESTORE</item>
       <item>CMAKE_VS_NsightTegra_VERSION</item>
       <item>CMAKE_VS_PLATFORM_NAME</item>
+      <item>CMAKE_VS_PLATFORM_NAME_DEFAULT</item>
       <item>CMAKE_VS_PLATFORM_TOOLSET</item>
       <item>CMAKE_VS_PLATFORM_TOOLSET_CUDA</item>
+      <item>CMAKE_VS_PLATFORM_TOOLSET_CUDA_CUSTOM_DIR</item>
       <item>CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE</item>
+      <item>CMAKE_VS_PLATFORM_TOOLSET_VERSION</item>
       <item>CMAKE_VS_SDK_EXCLUDE_DIRECTORIES</item>
       <item>CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES</item>
       <item>CMAKE_VS_SDK_INCLUDE_DIRECTORIES</item>
@@ -2539,6 +2549,10 @@
       <item>CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES</item>
       <item>CMAKE_VS_SDK_REFERENCE_DIRECTORIES</item>
       <item>CMAKE_VS_SDK_SOURCE_DIRECTORIES</item>
+      <item>CMAKE_VS_TARGET_FRAMEWORK_IDENTIFIER</item>
+      <item>CMAKE_VS_TARGET_FRAMEWORK_TARGETS_VERSION</item>
+      <item>CMAKE_VS_TARGET_FRAMEWORK_VERSION</item>
+      <item>CMAKE_VS_VERSION_BUILD_NUMBER</item>
       <item>CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION</item>
       <item>CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM</item>
       <item>CMAKE_VS_WINRT_BY_DEFAULT</item>
@@ -3477,6 +3491,7 @@
       <item>CMAKE_TOOLCHAIN_FILE</item>
       <item>CSFLAGS</item>
       <item>CTEST_INTERACTIVE_DEBUG_MODE</item>
+      <item>CTEST_NO_TESTS_ACTION</item>
       <item>CTEST_OUTPUT_ON_FAILURE</item>
       <item>CTEST_PARALLEL_LEVEL</item>
       <item>CTEST_PROGRESS_OUTPUT</item>
@@ -3985,6 +4000,7 @@
     </list>
 
     <list name="generator-expressions">
+      <item>IF</item>
       <item>0</item>
       <item>1</item>
       <item>BOOL</item>
@@ -3993,47 +4009,57 @@
       <item>NOT</item>
       <item>STREQUAL</item>
       <item>EQUAL</item>
-      <item>IN_LIST</item>
       <item>VERSION_LESS</item>
       <item>VERSION_GREATER</item>
       <item>VERSION_EQUAL</item>
       <item>VERSION_LESS_EQUAL</item>
       <item>VERSION_GREATER_EQUAL</item>
+      <item>LOWER_CASE</item>
+      <item>UPPER_CASE</item>
+      <item>MAKE_C_IDENTIFIER</item>
+      <item>IN_LIST</item>
+      <item>JOIN</item>
+      <item>REMOVE_DUPLICATES</item>
+      <item>FILTER</item>
       <item>PATH_EQUAL</item>
       <item>PATH</item>
-      <item>TARGET_EXISTS</item>
+      <item>SHELL_PATH</item>
       <item>CONFIG</item>
+      <item>OUTPUT_CONFIG</item>
+      <item>COMMAND_CONFIG</item>
       <item>PLATFORM_ID</item>
-      <item>C_COMPILER_ID</item>
-      <item>CXX_COMPILER_ID</item>
-      <item>CUDA_COMPILER_ID</item>
-      <item>Fortran_COMPILER_ID</item>
       <item>C_COMPILER_VERSION</item>
       <item>CXX_COMPILER_VERSION</item>
       <item>CUDA_COMPILER_VERSION</item>
+      <item>OBJC_COMPILER_VERSION</item>
+      <item>OBJCXX_COMPILER_VERSION</item>
       <item>Fortran_COMPILER_VERSION</item>
-      <item>TARGET_POLICY</item>
-      <item>COMPILE_FEATURES</item>
-      <item>COMPILE_LANG_AND_ID</item>
+      <item>HIP_COMPILER_VERSION</item>
+      <item>ISPC_COMPILER_VERSION</item>
+      <item>C_COMPILER_ID</item>
+      <item>CXX_COMPILER_ID</item>
+      <item>CUDA_COMPILER_ID</item>
+      <item>OBJC_COMPILER_ID</item>
+      <item>OBJCXX_COMPILER_ID</item>
+      <item>Fortran_COMPILER_ID</item>
+      <item>HIP_COMPILER_ID</item>
+      <item>ISPC_COMPILER_ID</item>
       <item>COMPILE_LANGUAGE</item>
-      <item>LINK_LANG_AND_ID</item>
+      <item>COMPILE_LANG_AND_ID</item>
+      <item>COMPILE_FEATURES</item>
       <item>LINK_LANGUAGE</item>
-      <item>DEVICE_LINK</item>
-      <item>HOST_LINK</item>
+      <item>LINK_LANG_AND_ID</item>
       <item>LINK_LIBRARY</item>
       <item>LINK_GROUP</item>
-      <item>ANGLE-R</item>
-      <item>COMMA</item>
-      <item>SEMICOLON</item>
-      <item>IF</item>
-      <item>JOIN</item>
-      <item>REMOVE_DUPLICATES</item>
-      <item>FILTER</item>
-      <item>LOWER_CASE</item>
-      <item>UPPER_CASE</item>
-      <item>GENEX_EVAL</item>
-      <item>TARGET_GENEX_EVAL</item>
+      <item>LINK_ONLY</item>
+      <item>DEVICE_LINK</item>
+      <item>HOST_LINK</item>
+      <item>TARGET_EXISTS</item>
       <item>TARGET_NAME_IF_EXISTS</item>
+      <item>TARGET_NAME</item>
+      <item>TARGET_PROPERTY</item>
+      <item>TARGET_OBJECTS</item>
+      <item>TARGET_POLICY</item>
       <item>TARGET_FILE</item>
       <item>TARGET_FILE_BASE_NAME</item>
       <item>TARGET_FILE_PREFIX</item>
@@ -4047,7 +4073,6 @@
       <item>TARGET_LINKER_FILE_NAME</item>
       <item>TARGET_LINKER_FILE_DIR</item>
       <item>TARGET_SONAME_FILE</item>
-      <item>TARGET_SONAME_FILE</item>
       <item>TARGET_SONAME_FILE_NAME</item>
       <item>TARGET_SONAME_FILE_DIR</item>
       <item>TARGET_PDB_FILE</item>
@@ -4057,18 +4082,16 @@
       <item>TARGET_BUNDLE_DIR_NAME</item>
       <item>TARGET_BUNDLE_DIR</item>
       <item>TARGET_BUNDLE_CONTENT_DIR</item>
-      <item>TARGET_PROPERTY</item>
       <item>TARGET_RUNTIME_DLLS</item>
-      <item>INSTALL_PREFIX</item>
-      <item>TARGET_NAME</item>
-      <item>LINK_ONLY</item>
       <item>INSTALL_INTERFACE</item>
       <item>BUILD_INTERFACE</item>
-      <item>MAKE_C_IDENTIFIER</item>
-      <item>TARGET_OBJECTS</item>
-      <item>SHELL_PATH</item>
-      <item>OUTPUT_CONFIG</item>
-      <item>COMMAND_CONFIG</item>
+      <item>BUILD_LOCAL_INTERFACE</item>
+      <item>INSTALL_PREFIX</item>
+      <item>GENEX_EVAL</item>
+      <item>TARGET_GENEX_EVAL</item>
+      <item>ANGLE-R</item>
+      <item>COMMA</item>
+      <item>SEMICOLON</item>
     </list>
 
     <list name="standard-modules">
@@ -6384,7 +6407,7 @@
       </context>
 
       <context attribute="Normal Text" lineEndContext="#stay" name="Detect More target-properties">
-        <RegExpr attribute="Property" context="#stay" String="\b(?:XCODE_EMBED_&var_ref_re;_REMOVE_HEADERS_ON_COPY|XCODE_EMBED_&var_ref_re;_PATH|XCODE_EMBED_&var_ref_re;_CODE_SIGN_ON_COPY|XCODE_EMBED_&var_ref_re;|XCODE_ATTRIBUTE_&var_ref_re;|VS_SOURCE_SETTINGS_&var_ref_re;|VS_GLOBAL_&var_ref_re;|VS_DOTNET_REFERENCE_&var_ref_re;|VS_DOTNET_REFERENCEPROP_&var_ref_re;_TAG_&var_ref_re;|STATIC_LIBRARY_FLAGS_&var_ref_re;|RUNTIME_OUTPUT_NAME_&var_ref_re;|RUNTIME_OUTPUT_DIRECTORY_&var_ref_re;|PDB_OUTPUT_DIRECTORY_&var_ref_re;|PDB_NAME_&var_ref_re;|OUTPUT_NAME_&var_ref_re;|OSX_ARCHITECTURES_&var_ref_re;|MAP_IMPORTED_CONFIG_&var_ref_re;|LOCATION_&var_ref_re;|LINK_INTERFACE_MULTIPLICITY_&var_ref_re;|LINK_INTERFACE_LIBRARIES_&var_ref_re;|LINK_FLAGS_&var_ref_re;|LIBRARY_OUTPUT_NAME_&var_ref_re;|LIBRARY_OUTPUT_DIRECTORY_&var_ref_re;|INTERPROCEDURAL_OPTIMIZATION_&var_ref_re;|IMPORTED_SONAME_&var_ref_re;|IMPORTED_OBJECTS_&var_ref_re;|IMPORTED_NO_SONAME_&var_ref_re;|IMPORTED_LOCATION_&var_ref_re;|IMPORTED_LINK_INTERFACE_MULTIPLICITY_&var_ref_re;|IMPORTED_LINK_INTERFACE_LIBRARIES_&var_ref_re;|IMPORTED_LINK_INTERFACE_LANGUAGES_&var_ref_re;|IMPORTED_LINK_DEPENDENT_LIBRARIES_&var_ref_re;|IMPORTED_LIBNAME_&var_ref_re;|IMPORTED_IMPLIB_&var_ref_re;|HEADER_SET_&var_ref_re;|HEADER_DIRS_&var_ref_re;|FRAMEWORK_MULTI_CONFIG_POSTFIX_&var_ref_re;|EXCLUDE_FROM_DEFAULT_BUILD_&var_ref_re;|COMPILE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|COMPILE_PDB_NAME_&var_ref_re;|ARCHIVE_OUTPUT_NAME_&var_ref_re;|ARCHIVE_OUTPUT_DIRECTORY_&var_ref_re;|&var_ref_re;_VISIBILITY_PRESET|&var_ref_re;_POSTFIX|&var_ref_re;_OUTPUT_NAME|&var_ref_re;_LINKER_LAUNCHER|&var_ref_re;_INCLUDE_WHAT_YOU_USE|&var_ref_re;_CPPLINT|&var_ref_re;_CPPCHECK|&var_ref_re;_COMPILER_LAUNCHER|&var_ref_re;_CLANG_TIDY)\b"/>
+        <RegExpr attribute="Property" context="#stay" String="\b(?:XCODE_EMBED_&var_ref_re;_REMOVE_HEADERS_ON_COPY|XCODE_EMBED_&var_ref_re;_PATH|XCODE_EMBED_&var_ref_re;_CODE_SIGN_ON_COPY|XCODE_EMBED_&var_ref_re;|XCODE_ATTRIBUTE_&var_ref_re;|VS_SOURCE_SETTINGS_&var_ref_re;|VS_GLOBAL_&var_ref_re;|VS_DOTNET_REFERENCE_&var_ref_re;|VS_DOTNET_REFERENCEPROP_&var_ref_re;_TAG_&var_ref_re;|STATIC_LIBRARY_FLAGS_&var_ref_re;|RUNTIME_OUTPUT_NAME_&var_ref_re;|RUNTIME_OUTPUT_DIRECTORY_&var_ref_re;|PDB_OUTPUT_DIRECTORY_&var_ref_re;|PDB_NAME_&var_ref_re;|OUTPUT_NAME_&var_ref_re;|OSX_ARCHITECTURES_&var_ref_re;|MAP_IMPORTED_CONFIG_&var_ref_re;|LOCATION_&var_ref_re;|LINK_INTERFACE_MULTIPLICITY_&var_ref_re;|LINK_INTERFACE_LIBRARIES_&var_ref_re;|LINK_FLAGS_&var_ref_re;|LIBRARY_OUTPUT_NAME_&var_ref_re;|LIBRARY_OUTPUT_DIRECTORY_&var_ref_re;|INTERPROCEDURAL_OPTIMIZATION_&var_ref_re;|IMPORTED_SONAME_&var_ref_re;|IMPORTED_OBJECTS_&var_ref_re;|IMPORTED_NO_SONAME_&var_ref_re;|IMPORTED_LOCATION_&var_ref_re;|IMPORTED_LINK_INTERFACE_MULTIPLICITY_&var_ref_re;|IMPORTED_LINK_INTERFACE_LIBRARIES_&var_ref_re;|IMPORTED_LINK_INTERFACE_LANGUAGES_&var_ref_re;|IMPORTED_LINK_DEPENDENT_LIBRARIES_&var_ref_re;|IMPORTED_LIBNAME_&var_ref_re;|IMPORTED_IMPLIB_&var_ref_re;|HEADER_SET_&var_ref_re;|HEADER_DIRS_&var_ref_re;|FRAMEWORK_MULTI_CONFIG_POSTFIX_&var_ref_re;|EXCLUDE_FROM_DEFAULT_BUILD_&var_ref_re;|COMPILE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|COMPILE_PDB_NAME_&var_ref_re;|ARCHIVE_OUTPUT_NAME_&var_ref_re;|ARCHIVE_OUTPUT_DIRECTORY_&var_ref_re;|&var_ref_re;_VISIBILITY_PRESET|&var_ref_re;_POSTFIX|&var_ref_re;_OUTPUT_NAME|&var_ref_re;_LINKER_LAUNCHER|&var_ref_re;_INCLUDE_WHAT_YOU_USE|&var_ref_re;_CPPLINT|&var_ref_re;_CPPCHECK|&var_ref_re;_COMPILER_LAUNCHER|&var_ref_re;_CLANG_TIDY_EXPORT_FIXES_DIR|&var_ref_re;_CLANG_TIDY)\b"/>
       </context>
 
       <context attribute="Normal Text" lineEndContext="#stay" name="Detect More source-properties">
@@ -6410,7 +6433,7 @@
 
       <context attribute="Normal Text" lineEndContext="#stay" name="Detect More Builtin Variables">
         <RegExpr attribute="CMake Internal Variable" context="#stay" String="\b(?:CMAKE_&var_ref_re;_PLATFORM_ID|CMAKE_&var_ref_re;_COMPILER_VERSION_INTERNAL|CMAKE_&var_ref_re;_COMPILER_ARCHITECTURE_ID|CMAKE_&var_ref_re;_COMPILER_ABI)\b"/>
-        <RegExpr attribute="Builtin Variable" context="#stay" String="\b(?:SWIG_MODULE_&var_ref_re;_EXTRA_DEPS|OpenMP_&var_ref_re;_SPEC_DATE|OpenMP_&var_ref_re;_LIB_NAMES|OpenMP_&var_ref_re;_LIBRARY|OpenMP_&var_ref_re;_FLAGS|OpenACC_&var_ref_re;_SPEC_DATE|OpenACC_&var_ref_re;_OPTIONS|OpenACC_&var_ref_re;_FLAGS|MPI_&var_ref_re;_LIB_NAMES|MPI_&var_ref_re;_LIBRARY|MPI_&var_ref_re;_COMPILE_OPTIONS|MPI_&var_ref_re;_COMPILE_DEFINITIONS|MPI_&var_ref_re;_COMPILER|MPI_&var_ref_re;_ADDITIONAL_INCLUDE_VARS|ICU_&var_ref_re;_LIBRARY|ICU_&var_ref_re;_EXECUTABLE|FETCHCONTENT_UPDATES_DISCONNECTED_&var_ref_re;|FETCHCONTENT_SOURCE_DIR_&var_ref_re;|ExternalData_URL_ALGO_&var_ref_re;_&var_ref_re;|ExternalData_CUSTOM_SCRIPT_&var_ref_re;|DOXYGEN_&var_ref_re;|CPACK_WIX_PROPERTY_&var_ref_re;|CPACK_WIX_&var_ref_re;_EXTRA_FLAGS|CPACK_WIX_&var_ref_re;_EXTENSIONS|CPACK_RPM_NO_&var_ref_re;_INSTALL_PREFIX_RELOCATION|CPACK_RPM_&var_ref_re;_USER_FILELIST|CPACK_RPM_&var_ref_re;_USER_BINARY_SPECFILE|CPACK_RPM_&var_ref_re;_PACKAGE_URL|CPACK_RPM_&var_ref_re;_PACKAGE_SUMMARY|CPACK_RPM_&var_ref_re;_PACKAGE_SUGGESTS|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_PREUN|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_PRE|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_POSTUN|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_POST|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES|CPACK_RPM_&var_ref_re;_PACKAGE_PROVIDES|CPACK_RPM_&var_ref_re;_PACKAGE_PREFIX|CPACK_RPM_&var_ref_re;_PACKAGE_OBSOLETES|CPACK_RPM_&var_ref_re;_PACKAGE_NAME|CPACK_RPM_&var_ref_re;_PACKAGE_GROUP|CPACK_RPM_&var_ref_re;_PACKAGE_DESCRIPTION|CPACK_RPM_&var_ref_re;_PACKAGE_CONFLICTS|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOREQPROV|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOREQ|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOPROV|CPACK_RPM_&var_ref_re;_PACKAGE_ARCHITECTURE|CPACK_RPM_&var_ref_re;_FILE_NAME|CPACK_RPM_&var_ref_re;_DEFAULT_USER|CPACK_RPM_&var_ref_re;_DEFAULT_GROUP|CPACK_RPM_&var_ref_re;_DEFAULT_FILE_PERMISSIONS|CPACK_RPM_&var_ref_re;_DEFAULT_DIR_PERMISSIONS|CPACK_RPM_&var_ref_re;_DEBUGINFO_PACKAGE|CPACK_RPM_&var_ref_re;_DEBUGINFO_FILE_NAME|CPACK_RPM_&var_ref_re;_BUILD_SOURCE_DIRS_PREFIX|CPACK_PREFLIGHT_&var_ref_re;_SCRIPT|CPACK_POSTFLIGHT_&var_ref_re;_SCRIPT|CPACK_NUGET_PACKAGE_DEPENDENCIES_&var_ref_re;_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_TITLE|CPACK_NUGET_&var_ref_re;_PACKAGE_TAGS|CPACK_NUGET_&var_ref_re;_PACKAGE_RELEASE_NOTES|CPACK_NUGET_&var_ref_re;_PACKAGE_OWNERS|CPACK_NUGET_&var_ref_re;_PACKAGE_NAME|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSE_FILE_NAME|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSE_EXPRESSION|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSEURL|CPACK_NUGET_&var_ref_re;_PACKAGE_LANGUAGE|CPACK_NUGET_&var_ref_re;_PACKAGE_ICONURL|CPACK_NUGET_&var_ref_re;_PACKAGE_ICON|CPACK_NUGET_&var_ref_re;_PACKAGE_HOMEPAGE_URL|CPACK_NUGET_&var_ref_re;_PACKAGE_DESCRIPTION_SUMMARY|CPACK_NUGET_&var_ref_re;_PACKAGE_DESCRIPTION|CPACK_NUGET_&var_ref_re;_PACKAGE_DEPENDENCIES_&var_ref_re;_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_DEPENDENCIES|CPACK_NUGET_&var_ref_re;_PACKAGE_COPYRIGHT|CPACK_NUGET_&var_ref_re;_PACKAGE_AUTHORS|CPACK_NSIS_&var_ref_re;_INSTALL_DIRECTORY|CPACK_DMG_&var_ref_re;_FILE_NAME|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SUGGESTS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SOURCE|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SHLIBDEPS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SECTION|CPACK_DEBIAN_&var_ref_re;_PACKAGE_REPLACES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_RECOMMENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PROVIDES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PRIORITY|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PREDEPENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_NAME|CPACK_DEBIAN_&var_ref_re;_PACKAGE_ENHANCES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_DEPENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONTROL_STRICT_PERMISSION|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONTROL_EXTRA|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONFLICTS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_BREAKS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_ARCHITECTURE|CPACK_DEBIAN_&var_ref_re;_FILE_NAME|CPACK_DEBIAN_&var_ref_re;_DESCRIPTION|CPACK_DEBIAN_&var_ref_re;_DEBUGINFO_PACKAGE|CPACK_COMPONENT_&var_ref_re;_REQUIRED|CPACK_COMPONENT_&var_ref_re;_HIDDEN|CPACK_COMPONENT_&var_ref_re;_GROUP|CPACK_COMPONENT_&var_ref_re;_DISPLAY_NAME|CPACK_COMPONENT_&var_ref_re;_DISABLED|CPACK_COMPONENT_&var_ref_re;_DESCRIPTION|CPACK_COMPONENT_&var_ref_re;_DEPENDS|CPACK_BINARY_&var_ref_re;|CPACK_ARCHIVE_&var_ref_re;_FILE_NAME|CPACK_&var_ref_re;_COMPONENT_INSTALL|CMAKE_XCODE_ATTRIBUTE_&var_ref_re;|CMAKE_USER_MAKE_RULES_OVERRIDE_&var_ref_re;|CMAKE_STATIC_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_STATIC_LINKER_FLAGS_&var_ref_re;|CMAKE_SHARED_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_SHARED_LINKER_FLAGS_&var_ref_re;|CMAKE_RUNTIME_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_REQUIRE_FIND_PACKAGE_&var_ref_re;|CMAKE_PROJECT_&var_ref_re;_INCLUDE_BEFORE|CMAKE_PROJECT_&var_ref_re;_INCLUDE|CMAKE_POLICY_WARNING_CMP[0-9]{4}|CMAKE_POLICY_DEFAULT_CMP[0-9]{4}|CMAKE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_MODULE_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_MODULE_LINKER_FLAGS_&var_ref_re;|CMAKE_MATCH_[0-9]+|CMAKE_MAP_IMPORTED_CONFIG_&var_ref_re;|CMAKE_LINK_LIBRARY_USING_&var_ref_re;_SUPPORTED|CMAKE_LINK_LIBRARY_USING_&var_ref_re;|CMAKE_LIBRARY_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_INTERPROCEDURAL_OPTIMIZATION_&var_ref_re;|CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_&var_ref_re;|CMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_&var_ref_re;|CMAKE_EXE_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_EXE_LINKER_FLAGS_&var_ref_re;|CMAKE_DISABLE_FIND_PACKAGE_&var_ref_re;|CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_ARGV[0-9]+|CMAKE_ARCHIVE_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_&var_ref_re;_VISIBILITY_PRESET|CMAKE_&var_ref_re;_STANDARD_LIBRARIES|CMAKE_&var_ref_re;_STANDARD_INCLUDE_DIRECTORIES|CMAKE_&var_ref_re;_SOURCE_FILE_EXTENSIONS|CMAKE_&var_ref_re;_SIZEOF_DATA_PTR|CMAKE_&var_ref_re;_SIMULATE_VERSION|CMAKE_&var_ref_re;_SIMULATE_ID|CMAKE_&var_ref_re;_POSTFIX|CMAKE_&var_ref_re;_OUTPUT_EXTENSION|CMAKE_&var_ref_re;_LINK_WHAT_YOU_USE_FLAG|CMAKE_&var_ref_re;_LINK_LIBRARY_USING_&var_ref_re;_SUPPORTED|CMAKE_&var_ref_re;_LINK_LIBRARY_USING_&var_ref_re;|CMAKE_&var_ref_re;_LINK_LIBRARY_FLAG|CMAKE_&var_ref_re;_LINK_LIBRARY_FILE_FLAG|CMAKE_&var_ref_re;_LINK_GROUP_USING_&var_ref_re;_SUPPORTED|CMAKE_&var_ref_re;_LINK_GROUP_USING_&var_ref_re;|CMAKE_&var_ref_re;_LINK_EXECUTABLE|CMAKE_&var_ref_re;_LINKER_WRAPPER_FLAG_SEP|CMAKE_&var_ref_re;_LINKER_WRAPPER_FLAG|CMAKE_&var_ref_re;_LINKER_PREFERENCE_PROPAGATES|CMAKE_&var_ref_re;_LINKER_PREFERENCE|CMAKE_&var_ref_re;_LINKER_LAUNCHER|CMAKE_&var_ref_re;_LIBRARY_ARCHITECTURE|CMAKE_&var_ref_re;_INCLUDE_WHAT_YOU_USE|CMAKE_&var_ref_re;_IMPLICIT_LINK_LIBRARIES|CMAKE_&var_ref_re;_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES|CMAKE_&var_ref_re;_IMPLICIT_LINK_DIRECTORIES|CMAKE_&var_ref_re;_IMPLICIT_INCLUDE_DIRECTORIES|CMAKE_&var_ref_re;_IGNORE_EXTENSIONS|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_RELWITHDEBINFO|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_RELEASE|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_MINSIZEREL|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_DEBUG|CMAKE_&var_ref_re;_FLAGS_RELWITHDEBINFO_INIT|CMAKE_&var_ref_re;_FLAGS_RELWITHDEBINFO|CMAKE_&var_ref_re;_FLAGS_RELEASE_INIT|CMAKE_&var_ref_re;_FLAGS_RELEASE|CMAKE_&var_ref_re;_FLAGS_MINSIZEREL_INIT|CMAKE_&var_ref_re;_FLAGS_MINSIZEREL|CMAKE_&var_ref_re;_FLAGS_INIT|CMAKE_&var_ref_re;_FLAGS_DEBUG_INIT|CMAKE_&var_ref_re;_FLAGS_DEBUG|CMAKE_&var_ref_re;_FLAGS_&var_ref_re;_INIT|CMAKE_&var_ref_re;_FLAGS_&var_ref_re;|CMAKE_&var_ref_re;_FLAGS|CMAKE_&var_ref_re;_EXTENSIONS_DEFAULT|CMAKE_&var_ref_re;_EXTENSIONS|CMAKE_&var_ref_re;_CREATE_STATIC_LIBRARY|CMAKE_&var_ref_re;_CREATE_SHARED_MODULE|CMAKE_&var_ref_re;_CREATE_SHARED_LIBRARY|CMAKE_&var_ref_re;_CPPLINT|CMAKE_&var_ref_re;_CPPCHECK|CMAKE_&var_ref_re;_COMPILE_OBJECT|CMAKE_&var_ref_re;_COMPILER_VERSION|CMAKE_&var_ref_re;_COMPILER_TARGET|CMAKE_&var_ref_re;_COMPILER_RANLIB|CMAKE_&var_ref_re;_COMPILER_LOADED|CMAKE_&var_ref_re;_COMPILER_LAUNCHER|CMAKE_&var_ref_re;_COMPILER_ID|CMAKE_&var_ref_re;_COMPILER_EXTERNAL_TOOLCHAIN|CMAKE_&var_ref_re;_COMPILER_AR|CMAKE_&var_ref_re;_COMPILER|CMAKE_&var_ref_re;_CLANG_TIDY|CMAKE_&var_ref_re;_BYTE_ORDER|CMAKE_&var_ref_re;_ARCHIVE_FINISH|CMAKE_&var_ref_re;_ARCHIVE_CREATE|CMAKE_&var_ref_re;_ARCHIVE_APPEND|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_SUFFIX|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_PREFIX|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_MACHINE|Boost_&var_ref_re;_LIBRARY_RELEASE|Boost_&var_ref_re;_LIBRARY_DEBUG|Boost_&var_ref_re;_LIBRARY|BISON_&var_ref_re;_OUTPUT_SOURCE|BISON_&var_ref_re;_OUTPUT_HEADER|BISON_&var_ref_re;_OUTPUTS|BISON_&var_ref_re;_INPUT|BISON_&var_ref_re;_DEFINED|BISON_&var_ref_re;_COMPILE_FLAGS|ARGV[0-9]+|&var_ref_re;__TRYRUN_OUTPUT|&var_ref_re;_VERSION_TWEAK|&var_ref_re;_VERSION_STRING|&var_ref_re;_VERSION_PATCH|&var_ref_re;_VERSION_MINOR|&var_ref_re;_VERSION_MAJOR|&var_ref_re;_VERSION_COUNT|&var_ref_re;_VERSION|&var_ref_re;_UNPARSED_ARGUMENTS|&var_ref_re;_STATIC_LINK_LIBRARIES|&var_ref_re;_SOURCE_DIR|&var_ref_re;_ROOT|&var_ref_re;_MODULE_NAME|&var_ref_re;_LINK_LIBRARIES|&var_ref_re;_LIBRARY_DIRS|&var_ref_re;_LIBRARIES|&var_ref_re;_LDFLAGS_OTHER|&var_ref_re;_LDFLAGS|&var_ref_re;_KEYWORDS_MISSING_VALUES|&var_ref_re;_IS_TOP_LEVEL|&var_ref_re;_INCLUDE_DIRS|&var_ref_re;_HOMEPAGE_URL|&var_ref_re;_FOUND|&var_ref_re;_FIND_VERSION_RANGE_MIN|&var_ref_re;_FIND_VERSION_RANGE_MAX|&var_ref_re;_FIND_VERSION_RANGE|&var_ref_re;_FIND_VERSION_MIN_TWEAK|&var_ref_re;_FIND_VERSION_MIN_PATCH|&var_ref_re;_FIND_VERSION_MIN_MINOR|&var_ref_re;_FIND_VERSION_MIN_MAJOR|&var_ref_re;_FIND_VERSION_MIN_COUNT|&var_ref_re;_FIND_VERSION_MIN|&var_ref_re;_FIND_VERSION_MAX_TWEAK|&var_ref_re;_FIND_VERSION_MAX_PATCH|&var_ref_re;_FIND_VERSION_MAX_MINOR|&var_ref_re;_FIND_VERSION_MAX_MAJOR|&var_ref_re;_FIND_VERSION_MAX_COUNT|&var_ref_re;_FIND_VERSION_MAX|&var_ref_re;_FIND_VERSION_EXACT|&var_ref_re;_FIND_VERSION_COUNT|&var_ref_re;_FIND_VERSION_COMPLETE|&var_ref_re;_FIND_REQUIRED_&var_ref_re;|&var_ref_re;_FIND_REQUIRED|&var_ref_re;_FIND_QUIETLY|&var_ref_re;_FIND_COMPONENTS|&var_ref_re;_DESCRIPTION|&var_ref_re;_CONSIDERED_VERSIONS|&var_ref_re;_CONSIDERED_CONFIGS|&var_ref_re;_CONFIG|&var_ref_re;_CFLAGS_OTHER|&var_ref_re;_CFLAGS|&var_ref_re;_BINARY_DIR)\b"/>
+        <RegExpr attribute="Builtin Variable" context="#stay" String="\b(?:SWIG_MODULE_&var_ref_re;_EXTRA_DEPS|OpenMP_&var_ref_re;_SPEC_DATE|OpenMP_&var_ref_re;_LIB_NAMES|OpenMP_&var_ref_re;_LIBRARY|OpenMP_&var_ref_re;_FLAGS|OpenACC_&var_ref_re;_SPEC_DATE|OpenACC_&var_ref_re;_OPTIONS|OpenACC_&var_ref_re;_FLAGS|MPI_&var_ref_re;_LIB_NAMES|MPI_&var_ref_re;_LIBRARY|MPI_&var_ref_re;_COMPILE_OPTIONS|MPI_&var_ref_re;_COMPILE_DEFINITIONS|MPI_&var_ref_re;_COMPILER|MPI_&var_ref_re;_ADDITIONAL_INCLUDE_VARS|ICU_&var_ref_re;_LIBRARY|ICU_&var_ref_re;_EXECUTABLE|FETCHCONTENT_UPDATES_DISCONNECTED_&var_ref_re;|FETCHCONTENT_SOURCE_DIR_&var_ref_re;|ExternalData_URL_ALGO_&var_ref_re;_&var_ref_re;|ExternalData_CUSTOM_SCRIPT_&var_ref_re;|DOXYGEN_&var_ref_re;|CPACK_WIX_PROPERTY_&var_ref_re;|CPACK_WIX_&var_ref_re;_EXTRA_FLAGS|CPACK_WIX_&var_ref_re;_EXTENSIONS|CPACK_RPM_NO_&var_ref_re;_INSTALL_PREFIX_RELOCATION|CPACK_RPM_&var_ref_re;_USER_FILELIST|CPACK_RPM_&var_ref_re;_USER_BINARY_SPECFILE|CPACK_RPM_&var_ref_re;_PACKAGE_URL|CPACK_RPM_&var_ref_re;_PACKAGE_SUMMARY|CPACK_RPM_&var_ref_re;_PACKAGE_SUGGESTS|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_PREUN|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_PRE|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_POSTUN|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES_POST|CPACK_RPM_&var_ref_re;_PACKAGE_REQUIRES|CPACK_RPM_&var_ref_re;_PACKAGE_PROVIDES|CPACK_RPM_&var_ref_re;_PACKAGE_PREFIX|CPACK_RPM_&var_ref_re;_PACKAGE_OBSOLETES|CPACK_RPM_&var_ref_re;_PACKAGE_NAME|CPACK_RPM_&var_ref_re;_PACKAGE_GROUP|CPACK_RPM_&var_ref_re;_PACKAGE_DESCRIPTION|CPACK_RPM_&var_ref_re;_PACKAGE_CONFLICTS|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOREQPROV|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOREQ|CPACK_RPM_&var_ref_re;_PACKAGE_AUTOPROV|CPACK_RPM_&var_ref_re;_PACKAGE_ARCHITECTURE|CPACK_RPM_&var_ref_re;_FILE_NAME|CPACK_RPM_&var_ref_re;_DEFAULT_USER|CPACK_RPM_&var_ref_re;_DEFAULT_GROUP|CPACK_RPM_&var_ref_re;_DEFAULT_FILE_PERMISSIONS|CPACK_RPM_&var_ref_re;_DEFAULT_DIR_PERMISSIONS|CPACK_RPM_&var_ref_re;_DEBUGINFO_PACKAGE|CPACK_RPM_&var_ref_re;_DEBUGINFO_FILE_NAME|CPACK_RPM_&var_ref_re;_BUILD_SOURCE_DIRS_PREFIX|CPACK_PREFLIGHT_&var_ref_re;_SCRIPT|CPACK_POSTFLIGHT_&var_ref_re;_SCRIPT|CPACK_NUGET_PACKAGE_DEPENDENCIES_&var_ref_re;_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_TITLE|CPACK_NUGET_&var_ref_re;_PACKAGE_TAGS|CPACK_NUGET_&var_ref_re;_PACKAGE_RELEASE_NOTES|CPACK_NUGET_&var_ref_re;_PACKAGE_OWNERS|CPACK_NUGET_&var_ref_re;_PACKAGE_NAME|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSE_FILE_NAME|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSE_EXPRESSION|CPACK_NUGET_&var_ref_re;_PACKAGE_LICENSEURL|CPACK_NUGET_&var_ref_re;_PACKAGE_LANGUAGE|CPACK_NUGET_&var_ref_re;_PACKAGE_ICONURL|CPACK_NUGET_&var_ref_re;_PACKAGE_ICON|CPACK_NUGET_&var_ref_re;_PACKAGE_HOMEPAGE_URL|CPACK_NUGET_&var_ref_re;_PACKAGE_DESCRIPTION_SUMMARY|CPACK_NUGET_&var_ref_re;_PACKAGE_DESCRIPTION|CPACK_NUGET_&var_ref_re;_PACKAGE_DEPENDENCIES_&var_ref_re;_VERSION|CPACK_NUGET_&var_ref_re;_PACKAGE_DEPENDENCIES|CPACK_NUGET_&var_ref_re;_PACKAGE_COPYRIGHT|CPACK_NUGET_&var_ref_re;_PACKAGE_AUTHORS|CPACK_NSIS_&var_ref_re;_INSTALL_DIRECTORY|CPACK_DMG_&var_ref_re;_FILE_NAME|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SUGGESTS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SOURCE|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SHLIBDEPS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_SECTION|CPACK_DEBIAN_&var_ref_re;_PACKAGE_REPLACES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_RECOMMENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PROVIDES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PRIORITY|CPACK_DEBIAN_&var_ref_re;_PACKAGE_PREDEPENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_NAME|CPACK_DEBIAN_&var_ref_re;_PACKAGE_ENHANCES|CPACK_DEBIAN_&var_ref_re;_PACKAGE_DEPENDS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONTROL_STRICT_PERMISSION|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONTROL_EXTRA|CPACK_DEBIAN_&var_ref_re;_PACKAGE_CONFLICTS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_BREAKS|CPACK_DEBIAN_&var_ref_re;_PACKAGE_ARCHITECTURE|CPACK_DEBIAN_&var_ref_re;_FILE_NAME|CPACK_DEBIAN_&var_ref_re;_DESCRIPTION|CPACK_DEBIAN_&var_ref_re;_DEBUGINFO_PACKAGE|CPACK_COMPONENT_&var_ref_re;_REQUIRED|CPACK_COMPONENT_&var_ref_re;_HIDDEN|CPACK_COMPONENT_&var_ref_re;_GROUP|CPACK_COMPONENT_&var_ref_re;_DISPLAY_NAME|CPACK_COMPONENT_&var_ref_re;_DISABLED|CPACK_COMPONENT_&var_ref_re;_DESCRIPTION|CPACK_COMPONENT_&var_ref_re;_DEPENDS|CPACK_BINARY_&var_ref_re;|CPACK_ARCHIVE_&var_ref_re;_FILE_NAME|CPACK_&var_ref_re;_COMPONENT_INSTALL|CMAKE_XCODE_ATTRIBUTE_&var_ref_re;|CMAKE_USER_MAKE_RULES_OVERRIDE_&var_ref_re;|CMAKE_STATIC_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_STATIC_LINKER_FLAGS_&var_ref_re;|CMAKE_SHARED_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_SHARED_LINKER_FLAGS_&var_ref_re;|CMAKE_RUNTIME_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_REQUIRE_FIND_PACKAGE_&var_ref_re;|CMAKE_PROJECT_&var_ref_re;_INCLUDE_BEFORE|CMAKE_PROJECT_&var_ref_re;_INCLUDE|CMAKE_POLICY_WARNING_CMP[0-9]{4}|CMAKE_POLICY_DEFAULT_CMP[0-9]{4}|CMAKE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_MODULE_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_MODULE_LINKER_FLAGS_&var_ref_re;|CMAKE_MATCH_[0-9]+|CMAKE_MAP_IMPORTED_CONFIG_&var_ref_re;|CMAKE_LINK_LIBRARY_USING_&var_ref_re;_SUPPORTED|CMAKE_LINK_LIBRARY_USING_&var_ref_re;|CMAKE_LIBRARY_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_INTERPROCEDURAL_OPTIMIZATION_&var_ref_re;|CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_&var_ref_re;|CMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_&var_ref_re;|CMAKE_EXE_LINKER_FLAGS_&var_ref_re;_INIT|CMAKE_EXE_LINKER_FLAGS_&var_ref_re;|CMAKE_DISABLE_FIND_PACKAGE_&var_ref_re;|CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_ARGV[0-9]+|CMAKE_ARCHIVE_OUTPUT_DIRECTORY_&var_ref_re;|CMAKE_&var_ref_re;_VISIBILITY_PRESET|CMAKE_&var_ref_re;_STANDARD_LIBRARIES|CMAKE_&var_ref_re;_STANDARD_INCLUDE_DIRECTORIES|CMAKE_&var_ref_re;_SOURCE_FILE_EXTENSIONS|CMAKE_&var_ref_re;_SIZEOF_DATA_PTR|CMAKE_&var_ref_re;_SIMULATE_VERSION|CMAKE_&var_ref_re;_SIMULATE_ID|CMAKE_&var_ref_re;_POSTFIX|CMAKE_&var_ref_re;_OUTPUT_EXTENSION|CMAKE_&var_ref_re;_LINK_WHAT_YOU_USE_FLAG|CMAKE_&var_ref_re;_LINK_LIBRARY_USING_&var_ref_re;_SUPPORTED|CMAKE_&var_ref_re;_LINK_LIBRARY_USING_&var_ref_re;|CMAKE_&var_ref_re;_LINK_LIBRARY_FLAG|CMAKE_&var_ref_re;_LINK_LIBRARY_FILE_FLAG|CMAKE_&var_ref_re;_LINK_GROUP_USING_&var_ref_re;_SUPPORTED|CMAKE_&var_ref_re;_LINK_GROUP_USING_&var_ref_re;|CMAKE_&var_ref_re;_LINK_EXECUTABLE|CMAKE_&var_ref_re;_LINKER_WRAPPER_FLAG_SEP|CMAKE_&var_ref_re;_LINKER_WRAPPER_FLAG|CMAKE_&var_ref_re;_LINKER_PREFERENCE_PROPAGATES|CMAKE_&var_ref_re;_LINKER_PREFERENCE|CMAKE_&var_ref_re;_LINKER_LAUNCHER|CMAKE_&var_ref_re;_LIBRARY_ARCHITECTURE|CMAKE_&var_ref_re;_INCLUDE_WHAT_YOU_USE|CMAKE_&var_ref_re;_IMPLICIT_LINK_LIBRARIES|CMAKE_&var_ref_re;_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES|CMAKE_&var_ref_re;_IMPLICIT_LINK_DIRECTORIES|CMAKE_&var_ref_re;_IMPLICIT_INCLUDE_DIRECTORIES|CMAKE_&var_ref_re;_IGNORE_EXTENSIONS|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_RELWITHDEBINFO|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_RELEASE|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_MINSIZEREL|CMAKE_&var_ref_re;_GHS_KERNEL_FLAGS_DEBUG|CMAKE_&var_ref_re;_FLAGS_RELWITHDEBINFO_INIT|CMAKE_&var_ref_re;_FLAGS_RELWITHDEBINFO|CMAKE_&var_ref_re;_FLAGS_RELEASE_INIT|CMAKE_&var_ref_re;_FLAGS_RELEASE|CMAKE_&var_ref_re;_FLAGS_MINSIZEREL_INIT|CMAKE_&var_ref_re;_FLAGS_MINSIZEREL|CMAKE_&var_ref_re;_FLAGS_INIT|CMAKE_&var_ref_re;_FLAGS_DEBUG_INIT|CMAKE_&var_ref_re;_FLAGS_DEBUG|CMAKE_&var_ref_re;_FLAGS_&var_ref_re;_INIT|CMAKE_&var_ref_re;_FLAGS_&var_ref_re;|CMAKE_&var_ref_re;_FLAGS|CMAKE_&var_ref_re;_EXTENSIONS_DEFAULT|CMAKE_&var_ref_re;_EXTENSIONS|CMAKE_&var_ref_re;_CREATE_STATIC_LIBRARY|CMAKE_&var_ref_re;_CREATE_SHARED_MODULE|CMAKE_&var_ref_re;_CREATE_SHARED_LIBRARY|CMAKE_&var_ref_re;_CPPLINT|CMAKE_&var_ref_re;_CPPCHECK|CMAKE_&var_ref_re;_COMPILE_OBJECT|CMAKE_&var_ref_re;_COMPILER_VERSION|CMAKE_&var_ref_re;_COMPILER_TARGET|CMAKE_&var_ref_re;_COMPILER_RANLIB|CMAKE_&var_ref_re;_COMPILER_LOADED|CMAKE_&var_ref_re;_COMPILER_LAUNCHER|CMAKE_&var_ref_re;_COMPILER_ID|CMAKE_&var_ref_re;_COMPILER_FRONTEND_VARIANT|CMAKE_&var_ref_re;_COMPILER_EXTERNAL_TOOLCHAIN|CMAKE_&var_ref_re;_COMPILER_AR|CMAKE_&var_ref_re;_COMPILER|CMAKE_&var_ref_re;_CLANG_TIDY_EXPORT_FIXES_DIR|CMAKE_&var_ref_re;_CLANG_TIDY|CMAKE_&var_ref_re;_BYTE_ORDER|CMAKE_&var_ref_re;_ARCHIVE_FINISH|CMAKE_&var_ref_re;_ARCHIVE_CREATE|CMAKE_&var_ref_re;_ARCHIVE_APPEND|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_SUFFIX|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_PREFIX|CMAKE_&var_ref_re;_ANDROID_TOOLCHAIN_MACHINE|Boost_&var_ref_re;_LIBRARY_RELEASE|Boost_&var_ref_re;_LIBRARY_DEBUG|Boost_&var_ref_re;_LIBRARY|BISON_&var_ref_re;_OUTPUT_SOURCE|BISON_&var_ref_re;_OUTPUT_HEADER|BISON_&var_ref_re;_OUTPUTS|BISON_&var_ref_re;_INPUT|BISON_&var_ref_re;_DEFINED|BISON_&var_ref_re;_COMPILE_FLAGS|ARGV[0-9]+|&var_ref_re;__TRYRUN_OUTPUT|&var_ref_re;_VERSION_TWEAK|&var_ref_re;_VERSION_STRING|&var_ref_re;_VERSION_PATCH|&var_ref_re;_VERSION_MINOR|&var_ref_re;_VERSION_MAJOR|&var_ref_re;_VERSION_COUNT|&var_ref_re;_VERSION|&var_ref_re;_UNPARSED_ARGUMENTS|&var_ref_re;_STATIC_LINK_LIBRARIES|&var_ref_re;_SOURCE_DIR|&var_ref_re;_ROOT|&var_ref_re;_MODULE_NAME|&var_ref_re;_LINK_LIBRARIES|&var_ref_re;_LIBRARY_DIRS|&var_ref_re;_LIBRARIES|&var_ref_re;_LDFLAGS_OTHER|&var_ref_re;_LDFLAGS|&var_ref_re;_KEYWORDS_MISSING_VALUES|&var_ref_re;_IS_TOP_LEVEL|&var_ref_re;_INCLUDE_DIRS|&var_ref_re;_HOMEPAGE_URL|&var_ref_re;_FOUND|&var_ref_re;_FIND_VERSION_RANGE_MIN|&var_ref_re;_FIND_VERSION_RANGE_MAX|&var_ref_re;_FIND_VERSION_RANGE|&var_ref_re;_FIND_VERSION_MIN_TWEAK|&var_ref_re;_FIND_VERSION_MIN_PATCH|&var_ref_re;_FIND_VERSION_MIN_MINOR|&var_ref_re;_FIND_VERSION_MIN_MAJOR|&var_ref_re;_FIND_VERSION_MIN_COUNT|&var_ref_re;_FIND_VERSION_MIN|&var_ref_re;_FIND_VERSION_MAX_TWEAK|&var_ref_re;_FIND_VERSION_MAX_PATCH|&var_ref_re;_FIND_VERSION_MAX_MINOR|&var_ref_re;_FIND_VERSION_MAX_MAJOR|&var_ref_re;_FIND_VERSION_MAX_COUNT|&var_ref_re;_FIND_VERSION_MAX|&var_ref_re;_FIND_VERSION_EXACT|&var_ref_re;_FIND_VERSION_COUNT|&var_ref_re;_FIND_VERSION_COMPLETE|&var_ref_re;_FIND_REQUIRED_&var_ref_re;|&var_ref_re;_FIND_REQUIRED|&var_ref_re;_FIND_QUIETLY|&var_ref_re;_FIND_COMPONENTS|&var_ref_re;_DESCRIPTION|&var_ref_re;_CONSIDERED_VERSIONS|&var_ref_re;_CONSIDERED_CONFIGS|&var_ref_re;_CONFIG|&var_ref_re;_CFLAGS_OTHER|&var_ref_re;_CFLAGS|&var_ref_re;_BINARY_DIR)\b"/>
       </context>
 
       <context attribute="Normal Text" lineEndContext="#stay" name="Detect Variable Substitutions">
diff --git a/skylighting-core/xml/coffee.xml b/skylighting-core/xml/coffee.xml
index 6d5e8b669..9df3657ca 100644
--- a/skylighting-core/xml/coffee.xml
+++ b/skylighting-core/xml/coffee.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 
 <language name="CoffeeScript"
           version="15"
diff --git a/skylighting-core/xml/coldfusion.xml b/skylighting-core/xml/coldfusion.xml
index 6fe257e09..0eaa6696f 100644
--- a/skylighting-core/xml/coldfusion.xml
+++ b/skylighting-core/xml/coldfusion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language name="ColdFusion" version="5" kateversion="5.0" section="Markup" extensions="*.cfm;*.cfc;*.cfml;*.dbm" mimetype="text/x-coldfusion">
+<!DOCTYPE language>
+<language name="ColdFusion" version="6" kateversion="5.0" section="Markup" extensions="*.cfm;*.cfc;*.cfml;*.dbm" mimetype="text/x-coldfusion">
 
 	<highlighting>
 
@@ -510,6 +510,7 @@
 		<contexts>
 
 			<context attribute="Normal Text" lineEndContext="#stay" name="Normal Text">
+				<DetectSpaces attribute="Normal Text" />
 				<StringDetect attribute="CF Comment" context="ctxCF Comment" String="&lt;!---" beginRegion="CF Comment" />
 				<StringDetect attribute="HTML Comment" context="ctxHTML Comment" String="&lt;!--" beginRegion="HTML Comment" />
 				<StringDetect attribute="Script Tags" context="ctxCFSCRIPT Tag" String="&lt;cfscript" insensitive="true" beginRegion="CF Script" />
@@ -532,10 +533,10 @@
 
 
 			<context name="Tag Content" attribute="Normal Text" lineEndContext="#stay">
-				<RegExpr attribute="Tag Attributes" context="#stay" String="(?:\s|^)[A-Za-z_:*][\w.:_-]*(?=\s*\=)" />
 				<DetectChar attribute="Normal Text" context="#stay" char="=" />
 				<RangeDetect attribute="Attribute Values" context="#stay" char="&quot;" char1="&quot;" />
 				<RangeDetect attribute="Attribute Values" context="#stay" char="'" char1="'" />
+				<RegExpr attribute="Tag Attributes" context="#stay" String="(?:\s|^)[A-Za-z_:*][\w.:_-]*(?=\s*\=)" />
 			</context>
 
 			<context name="ctxCFSCRIPT Tag" attribute="Script Tags" lineEndContext="#stay">
@@ -593,23 +594,31 @@
 
 
 			<context name="ctxHTML Comment" attribute="HTML Comment" lineEndContext="#stay">
+				<DetectSpaces attribute="HTML Comment" />
 				<StringDetect attribute="CF Comment" context="ctxCF Comment" String="&lt;!---" beginRegion="CF Comment" />
 				<StringDetect attribute="HTML Comment" context="#pop" String="--&gt;" endRegion="HTML Comment" />
 				<IncludeRules context="##Comments" />
+				<DetectIdentifier attribute="HTML Comment" />
 			</context>
 
 			<context name="ctxCF Comment" attribute="CF Comment" lineEndContext="#stay">
+				<DetectSpaces attribute="CF Comment" />
 				<StringDetect attribute="CF Comment" context="#pop" String="---&gt;" endRegion="CF Comment" />
 				<IncludeRules context="##Comments" />
+				<DetectIdentifier attribute="CF Comment" />
 			</context>
 
 			<context name="ctxC Style Comment" attribute="Script Comment" lineEndContext="#stay">
+				<DetectSpaces attribute="Script Comment" />
 				<Detect2Chars attribute="Script Comment" context="#pop" char="*" char1="/" endRegion="CComment" />
 				<IncludeRules context="##Comments" />
+				<DetectIdentifier attribute="Script Comment" />
 			</context>
 
 			<context name="ctxOne Line Comment" attribute="Script Comment" lineEndContext="#pop">
+				<DetectSpaces attribute="Script Comment" />
 				<IncludeRules context="##Comments" />
+				<DetectIdentifier attribute="Script Comment" />
 			</context>
 
 			<context name="ctxHTML Entities" attribute="HTML Entities" lineEndContext="#pop">
@@ -618,61 +627,69 @@
 
 
 
-			<context name="ctxCFSCRIPT Block" attribute="Normal Text" lineEndContext="#stay">
+			<context name="SCRIPT Block" attribute="Normal Text" lineEndContext="#stay">
+				<DetectSpaces attribute="Normal Text" />
 				<Detect2Chars attribute="Script Comment" context="ctxC Style Comment" char="/" char1="*" beginRegion="CComment" />
 				<Detect2Chars attribute="Script Comment" context="ctxOne Line Comment" char="/" char1="/" />
 				<RangeDetect attribute="Script Strings" context="#stay" char="&quot;" char1="&quot;" />
 				<RangeDetect attribute="Script Strings" context="#stay" char="'" char1="'" />
-				<Int attribute="Script Numbers" context="#stay" />
 				<Float attribute="Script Numbers" context="#stay" />
+				<Int attribute="Script Numbers" context="#stay" />
 				<AnyChar attribute="Script Operators" context="#stay" String="()[]=+-*/" />
 				<AnyChar attribute="Brackets" context="#stay" String="{}" />
+			</context>
+
+
+
+			<context name="ctxCFSCRIPT Block" attribute="Normal Text" lineEndContext="#stay">
+				<IncludeRules context="SCRIPT Block" />
 
 				<keyword attribute="Script Keywords" context="#stay" String="CFSCRIPT Keywords" />
 				<keyword attribute="Script Functions" context="#stay" String="CFSCRIPT Functions" />
 				<StringDetect attribute="Script Tags" context="#pop#pop" String="&lt;/cfscript&gt;" insensitive="true" endRegion="CF Script" />
+				<DetectIdentifier attribute="Normal Text" />
 			</context>
 
 
 
 			<context name="ctxSCRIPT Block" attribute="Normal Text" lineEndContext="#stay">
-				<Detect2Chars attribute="Script Comment" context="ctxC Style Comment" char="/" char1="*" beginRegion="CComment" />
-				<Detect2Chars attribute="Script Comment" context="ctxOne Line Comment" char="/" char1="/" />
-				<RangeDetect attribute="Script Strings" context="#stay" char="&quot;" char1="&quot;" />
-				<RangeDetect attribute="Script Strings" context="#stay" char="'" char1="'" />
-				<Int attribute="Script Numbers" context="#stay" />
-				<Float attribute="Script Numbers" context="#stay" />
-				<AnyChar attribute="Script Operators" context="#stay" String="()[]=+-*/" />
-				<AnyChar attribute="Brackets" context="#stay" String="{}" />
+				<IncludeRules context="SCRIPT Block" />
 
 				<keyword attribute="Script Keywords" context="#stay" String="Script Keywords" />
 				<keyword attribute="Script Objects" context="#stay" String="Script Objects" />
 				<keyword attribute="Script Functions" context="#stay" String="Script Methods" />
 				<StringDetect attribute="Script Tags" context="#pop#pop" String="&lt;/script&gt;" insensitive="true" endRegion="Script" />
+				<DetectIdentifier attribute="Normal Text" />
 			</context>
 
 
 
 			<context name="ctxSTYLE Block" attribute="Style Selectors" lineEndContext="#stay">
+				<DetectSpaces attribute="Style Selectors" />
+				<DetectIdentifier attribute="Style Selectors" />
 				<Detect2Chars attribute="Script Comment" context="ctxC Style Comment" char="/" char1="*" beginRegion="CComment" />
 				<DetectChar attribute="Brackets" context="ctxStyle Properties" char="{" />
 				<StringDetect attribute="Style Tags" context="#pop#pop" String="&lt;/style&gt;" insensitive="true" endRegion="Style" />
 			</context>
 
 			<context name="ctxStyle Properties" attribute="Style Properties" lineEndContext="#stay">
+				<DetectSpaces attribute="Style Properties" />
+				<DetectIdentifier attribute="Style Properties" />
 				<DetectChar attribute="Brackets" context="#pop" char="}" />
 				<Detect2Chars attribute="Script Comment" context="ctxC Style Comment" char="/" char1="*" beginRegion="CComment" />
 				<DetectChar attribute="Normal Text" context="ctxStyle Values" char=":" />
 			</context>
 
 			<context name="ctxStyle Values" attribute="Style Values" lineEndContext="#pop">
+				<DetectSpaces attribute="Style Values" />
+				<DetectIdentifier attribute="Style Values" />
 				<DetectChar attribute="Normal Text" context="#pop" char=";" />
 				<DetectChar attribute="Normal Text" context="#stay" char="," />
-				<Int attribute="Numbers" context="#stay" />
 				<Float attribute="Numbers" context="#stay" />
-				<RegExpr attribute="Numbers" context="#stay" String="#(?:[0-9a-fA-F]{3})|(?:[0-9a-fA-F]{6})" />
+				<Int attribute="Numbers" context="#stay" />
 				<RangeDetect attribute="Attribute Values" context="#stay" char="&quot;" char1="&quot;" />
 				<RangeDetect attribute="Attribute Values" context="#stay" char="'" char1="'" />
+				<RegExpr attribute="Numbers" context="#stay" String="#(?:[0-9a-fA-F]{8}|[0-9a-fA-F]{6}|[0-9a-fA-F]{3})" />
 			</context>
 
 		</contexts>
diff --git a/skylighting-core/xml/comments.xml b/skylighting-core/xml/comments.xml
index cd66a4133..011dc8ab2 100644
--- a/skylighting-core/xml/comments.xml
+++ b/skylighting-core/xml/comments.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language
     version="1"
     kateversion="5.0"
diff --git a/skylighting-core/xml/commonlisp.xml b/skylighting-core/xml/commonlisp.xml
index 16164813b..884c3d7cf 100644
--- a/skylighting-core/xml/commonlisp.xml
+++ b/skylighting-core/xml/commonlisp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
     <!ENTITY identchar "[A-Za-z0-9-+&lt;&gt;/*]">
 ]>
 <language version="11" kateversion="5.79" name="Common Lisp" section="Sources" extensions="*.lisp;*.cl;*.lsp;*.el" mimetype="" author="Dominik Haumann (dhaumann@kde.org)" license="MIT">
diff --git a/skylighting-core/xml/cpp.xml b/skylighting-core/xml/cpp.xml
index 81c275689..d0fc7be92 100644
--- a/skylighting-core/xml/cpp.xml
+++ b/skylighting-core/xml/cpp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY space " ">
     <!ENTITY separators ",&#59;">
diff --git a/skylighting-core/xml/cs.xml b/skylighting-core/xml/cs.xml
index ab374558b..6a151371e 100644
--- a/skylighting-core/xml/cs.xml
+++ b/skylighting-core/xml/cs.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="C#" version="13" kateversion="5.0" section="Sources" extensions="*.cs;*.ashx" mimetype="text/x-csharp-src;text/x-csharp-hde" indenter="cstyle" style="C++">
   <highlighting>
     <list name="keywords">
diff --git a/skylighting-core/xml/css.xml b/skylighting-core/xml/css.xml
index 9ecf4cb70..30de88958 100644
--- a/skylighting-core/xml/css.xml
+++ b/skylighting-core/xml/css.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!-- https://www.w3.org/TR/CSS22/syndata.html#tokenization -->
   <!ENTITY nmstart "[_a-zA-Z]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
diff --git a/skylighting-core/xml/curry.xml b/skylighting-core/xml/curry.xml
index 8b7d3a309..4c16044f8 100644
--- a/skylighting-core/xml/curry.xml
+++ b/skylighting-core/xml/curry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!-- qualification of entities -->
   <!ENTITY qualify     "(?:[A-Z][a-zA-Z0-9_']*\.)*">
diff --git a/skylighting-core/xml/d.xml b/skylighting-core/xml/d.xml
index 72f9614bc..0c3ea7dcd 100644
--- a/skylighting-core/xml/d.xml
+++ b/skylighting-core/xml/d.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
   <!ENTITY hexfloat "0[xX][\da-fA-F_]*(?:\.[\da-fA-F_]*)?[pP][-+]?\d[\d_]*[fFL]?i?">
   <!-- Float starting with a dot is matched in main context -->
   <!-- All floats except integers -->
diff --git a/skylighting-core/xml/dart.xml b/skylighting-core/xml/dart.xml
index 14d5aabdc..e466211f1 100644
--- a/skylighting-core/xml/dart.xml
+++ b/skylighting-core/xml/dart.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 
 <language name="Dart"
           section="Sources"
-          version="2"
+          version="3"
           kateversion="5.0"
           indenter="cstyle"
           extensions="*.dart"
@@ -138,11 +138,11 @@
                 <keyword attribute="Modifiers" context="#stay" String="modifiers"/>
                 <keyword attribute="Constant" context="#stay" String="literals"/>
                 <keyword attribute="Exceptions" context="#stay" String="exceptions"/>
-                <keyword attribute="This Keyword" context="#stay" String="thiskeyword"/>
+                <WordDetect attribute="This Keyword" context="#stay" String="this"/>
                 <DetectIdentifier />
 
-                <Int attribute="Decimal" context="#stay"/>
                 <Float attribute="Float" context="#stay"/>
+                <Int attribute="Decimal" context="#stay"/>
                 <HlCHex attribute="Hex" context="#stay"/>
                 <HlCOct attribute="Octal" context="#stay"/>
 
@@ -156,12 +156,16 @@
 
             <!-- Strings -->
             <context attribute="String" lineEndContext="#pop" name="DoubleQuoteString">
+                <DetectSpaces attribute="String"/>
+                <DetectIdentifier attribute="String"/>
                 <LineContinue attribute="String" context="#stay"/>
                 <HlCStringChar attribute="String Char" context="#stay"/>
                 <DetectChar attribute="String" context="#pop" char="&quot;"/>
             </context>
 
             <context attribute="String" lineEndContext="#pop" name="SingleQuoteString" >
+                <DetectSpaces attribute="String"/>
+                <DetectIdentifier attribute="String"/>
                 <HlCStringChar attribute="String Char" context="#stay"/>
                 <DetectChar attribute="String" context="#pop" char="'" />
             </context>
@@ -184,13 +188,17 @@
             </context>
 
             <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+                <DetectSpaces attribute="Comment"/>
                 <LineContinue attribute="Comment" context="#stay"/>
                 <IncludeRules context="##Comments" />
+                <DetectIdentifier attribute="Comment"/>
             </context>
 
             <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
+                <DetectSpaces attribute="Comment"/>
                 <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
                 <IncludeRules context="##Comments" />
+                <DetectIdentifier attribute="Comment"/>
             </context>
         </contexts>
 
diff --git a/skylighting-core/xml/diff.xml b/skylighting-core/xml/diff.xml
index c58eee7e0..6a8ff390e 100644
--- a/skylighting-core/xml/diff.xml
+++ b/skylighting-core/xml/diff.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
-  <!ENTITY file  "(====|\*\*\*|\-\-\-|diff|Only in .*:).*$">
+  <!ENTITY file  "(====|\*\*\*|\-\-\-|diff|Only in [^:]*:).*$">
 ]>
 <!--
     2006-08-02: 1.10 Matthew Woehlke <mw_triad@sourceforge.net>
@@ -12,7 +12,7 @@
     2008-02-13: 1.11 Eduardo Robles Elvira <edulix AT gmail DOT com>
      Fixed folding.
 -->
-<language name="Diff" version="8" kateversion="5.62" section="Other" extensions="*.diff;*patch;*.rej" mimetype="text/x-patch">
+<language name="Diff" version="9" kateversion="5.62" section="Other" extensions="*.diff;*patch;*.rej" mimetype="text/x-patch">
 
   <highlighting>
 
@@ -22,7 +22,7 @@
         <Detect2Chars attribute="Header" context="AttrHeader_Chunk" char="@" char1="@" beginRegion="chunk" column="0"/>
         <AnyChar attribute="Header" context="AttrHeader_Chunk" String="0123456789" beginRegion="chunk" column="0"/>
         <RegExpr attribute="Header" context="RChunk" String="^\*+$" beginRegion="chunk" column="0"/>
-        <RegExpr attribute="File" context="#stay" String="^Only in .*:.*$" column="0"/>
+        <RegExpr attribute="File" context="#stay" String="^Only in [^:]*:.*$" column="0"/>
         <StringDetect attribute="File" context="AttrFile_RFile" String="diff" beginRegion="chunk" column="0"/>
         <StringDetect attribute="File" context="AttrFile" String="====" column="0"/>
         <StringDetect attribute="File" context="AttrFile_File" String="***" beginRegion="chunk" column="0"/>
@@ -66,7 +66,7 @@
 
       <!-- block contexts (diff -r) -->
       <context attribute="Normal Text" lineEndContext="#stay" name="RFile" fallthroughContext="AttrNormal">
-        <RegExpr attribute="File" context="#pop" String="^(diff|Only in .*:).*$" endRegion="chunk" lookAhead="true" column="0"/>
+        <RegExpr attribute="File" context="#pop" String="^(diff|Only in [^:]*:)" endRegion="chunk" lookAhead="true" column="0"/>
         <RegExpr attribute="Header" context="#stay" String="^&file;" column="0"/>
         <RegExpr attribute="Header" context="RChunkInFile" String="^\*+$" beginRegion="chunk" column="0"/>
         <IncludeRules context="File"/>
diff --git a/skylighting-core/xml/djangotemplate.xml b/skylighting-core/xml/djangotemplate.xml
index c3370f611..047213ac5 100644
--- a/skylighting-core/xml/djangotemplate.xml
+++ b/skylighting-core/xml/djangotemplate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
diff --git a/skylighting-core/xml/dockerfile.xml b/skylighting-core/xml/dockerfile.xml
index 88c73f040..de146e019 100644
--- a/skylighting-core/xml/dockerfile.xml
+++ b/skylighting-core/xml/dockerfile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
     This file is part of KDE's kate project.
 
@@ -11,9 +11,9 @@
 <language
     name="Dockerfile"
     section="Other"
-    version="10"
+    version="11"
     kateversion="5.79"
-    extensions="Dockerfile"
+    extensions="Dockerfile;Containerfile"
     author="James Turnbull (james@lovedthanlost.net)"
     license="MIT"
   >
diff --git a/skylighting-core/xml/dot.xml b/skylighting-core/xml/dot.xml
index 2a7214766..00d0f8c52 100644
--- a/skylighting-core/xml/dot.xml
+++ b/skylighting-core/xml/dot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- Adapted from the VIM highlighter, by Markus Mottl (markus@oefai.at) -->
 <language name="dot" version="5" kateversion="5.0" section="Scientific" extensions="*.dot" mimetype="text/x-dot" author="Postula Loïs (lois.postula@live.be)" priority="0">
 
diff --git a/skylighting-core/xml/doxygen.xml b/skylighting-core/xml/doxygen.xml
index 5516c1454..da87e4d91 100644
--- a/skylighting-core/xml/doxygen.xml
+++ b/skylighting-core/xml/doxygen.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY wordsep "(?:[][,?;()]|\.$|\.?\s|$)">   <!-- things that end a TagWord -->
     <!ENTITY sl_word ".*?(?=&wordsep;)">
     <!ENTITY ml_word ".*?(?=&wordsep;|\*/)">
 ]>
 <language name="Doxygen"
-          version="14"
+          version="15"
           kateversion="5.0"
           section="Markup"
           extensions="*.dox;*.doxygen"
@@ -586,7 +586,7 @@
         <Detect2Chars attribute="Tags" context="#pop!LanguageId" char="@" char1="~" />
         <keyword attribute="Error" context="#pop" String="TagEnd" />
         <RegExpr attribute="Error" context="#pop" String="[@\\]f[]}]" />
-        <RegExpr attribute="Tags" context="#pop" String="[@\\](?:[#$%&amp;&lt;&gt;&quot;@\\.]|::|---?)(?=&wordsep;)" />
+        <RegExpr attribute="Escape sequence" context="#pop" String="[@\\](?:[#$%&amp;&lt;&gt;&quot;@\\.~=|]|::|---?)" />
         <RegExpr attribute="Custom Tags" context="#pop" String="[@\\](?:[^@\\ \t\*]|\*(?!/))+" />
         <AnyChar attribute="Comment" context="#pop" String="\@" />
       </context>
@@ -598,6 +598,7 @@
   </contexts>
     <itemDatas>
       <itemData name="Normal Text"  defStyleNum="dsNormal" />
+      <itemData name="Escape sequence" defStyleNum="dsSpecialChar" />
       <itemData name="Tags"         defStyleNum="dsAnnotation" bold="1" />
       <itemData name="Custom Tags"  defStyleNum="dsAnnotation" />
       <itemData name="Word"         defStyleNum="dsCommentVar" bold="1" italic="0" />
diff --git a/skylighting-core/xml/dtd.xml b/skylighting-core/xml/dtd.xml
index 8093b1c4e..0526efc62 100644
--- a/skylighting-core/xml/dtd.xml
+++ b/skylighting-core/xml/dtd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"[
+<!DOCTYPE language[
   <!ENTITY nmtoken "[\-\w\d\.:_]+">
   <!ENTITY entref  "(#[0-9]+|#[xX][0-9A-Fa-f]+|&nmtoken;);">
 ]>
diff --git a/skylighting-core/xml/eiffel.xml b/skylighting-core/xml/eiffel.xml
index 8615fdaa9..45ea0731a 100644
--- a/skylighting-core/xml/eiffel.xml
+++ b/skylighting-core/xml/eiffel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
 Eiffel syntax highlighting for Kate and Kwrite editors
 
@@ -10,7 +10,7 @@ Change log:
 
 Author of version 1.02: Sebastian Vuorinen
 -->
-<language name="Eiffel" version="4" kateversion="5.0" section="Sources" extensions="*.e" mimetype="text/x-eiffel-src" author="Sebastian Vuorinen" license="">
+<language name="Eiffel" version="5" kateversion="5.0" section="Sources" extensions="*.e" mimetype="text/x-eiffel-src" author="Sebastian Vuorinen" license="">
 	<highlighting>
 		<list name="keywords">
 			<item>agent</item>
@@ -81,12 +81,14 @@ Author of version 1.02: Sebastian Vuorinen
 
 		<contexts>
 			<context name = "Normal" attribute = "Normal Text" lineEndContext="#stay">
+				<DetectSpaces attribute = "Normal Text" />
 				<keyword attribute = "Keyword" String = "keywords" context="#stay" />
 				<keyword attribute = "Predefined entities" String = "predefined-entities" context="#stay" />
 				<keyword attribute = "Assertions" String = "assertions" context="#stay" />
+				<DetectIdentifier attribute = "Normal Text" />
 
-				<Int attribute = "Decimal" context="#stay" />
 				<Float attribute = "Float" context="#stay" />
+				<Int attribute = "Decimal" context="#stay" />
 				<HlCChar attribute = "Char" context="#stay" />
 				<DetectChar attribute = "String" char = "&quot;" context="Quoted String" />
 
@@ -100,6 +102,7 @@ Author of version 1.02: Sebastian Vuorinen
 			<context name = "Documentation" attribute="Comment" lineEndContext="#pop">
 				<DetectSpaces />
 				<IncludeRules context="##Comments" />
+				<DetectIdentifier />
 			</context>
 		</contexts>
 
diff --git a/skylighting-core/xml/elixir.xml b/skylighting-core/xml/elixir.xml
index 4b22d46f7..fbfc52cb8 100644
--- a/skylighting-core/xml/elixir.xml
+++ b/skylighting-core/xml/elixir.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language
-  SYSTEM 'language.dtd' [
-
+<!DOCTYPE language [
   <!ENTITY symbols "(?:@{1,2}|\$)?[a-zA-Z_][a-zA-Z0-9_]*[=?!]?">
 ]>
 <!--
@@ -25,7 +23,7 @@
 -->
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
 <language author="Rubén Caro (ruben.caro.estevez@gmail.com), Boris Egorov (egorov@linux.com)"
-          extensions="*.ex;*.exs;*.eex;*.xml.eex;*.js.eex"
+          extensions="*.ex;*.exs;*.eex;*.xml.eex;*.js.eex;*.heex"
           indenter="elixir"
           kateversion="5.79"
           license="LGPLv2+"
@@ -33,7 +31,8 @@
           name="Elixir"
           section="Sources"
           style="elixir"
-          version="13">
+          version="15"
+          priority="2">
   <highlighting>
     <list name="control-flow">
       <item>catch</item>
diff --git a/skylighting-core/xml/elm.xml b/skylighting-core/xml/elm.xml
index 23410848d..425733166 100644
--- a/skylighting-core/xml/elm.xml
+++ b/skylighting-core/xml/elm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Elm" version="8" kateversion="5.0" section="Sources" extensions="*.elm" author="Bonghyun Kim (bonghyun.d.kim@gmail.com)" license="MIT" style="elm">
   <highlighting>
     <list name="declarations">
diff --git a/skylighting-core/xml/email.xml b/skylighting-core/xml/email.xml
index 7d599c2e9..75ef5635d 100644
--- a/skylighting-core/xml/email.xml
+++ b/skylighting-core/xml/email.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Email" version="7" kateversion="5.0" extensions="*.eml;*.email;*.emlx;*.mbox;*.mbx" section="Other" mimetype="message/rfc822" casesensitive="0" author="Volker Krause (vkrause@kde.org)" license="MIT">
     <highlighting>
         <list name="header-names">
diff --git a/skylighting-core/xml/erlang.xml b/skylighting-core/xml/erlang.xml
index e17c1dbee..6f17dd05f 100644
--- a/skylighting-core/xml/erlang.xml
+++ b/skylighting-core/xml/erlang.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
           <!ENTITY atomstr    "\b[a-z][_a-z@-Z0-9]*(?:(?=[^_a-z@-Z0-9])|$)" >
           <!ENTITY varstr    "\b[_A-Z][_a-z@-Z0-9]*(?:(?=[^_a-z@-Z0-9])|$)" >
diff --git a/skylighting-core/xml/fasm.xml b/skylighting-core/xml/fasm.xml
index da96aad0d..0684ba6a8 100644
--- a/skylighting-core/xml/fasm.xml
+++ b/skylighting-core/xml/fasm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY float "[0-9]++(?:\.[0-9]*+(?:e[-+]?[0-9]*+)?|(?=f\b)|e[-+]?[0-9]++\b)">
 
diff --git a/skylighting-core/xml/fortran-fixed.xml b/skylighting-core/xml/fortran-fixed.xml
index 4d407723a..2e8c595cf 100644
--- a/skylighting-core/xml/fortran-fixed.xml
+++ b/skylighting-core/xml/fortran-fixed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
   <!-- Integers with optional kind specifier -->
   <!ENTITY integer "\b[0-9]++(?:[_](?:[0-9]++|[a-zA-Z][\w_]*))?">
   <!-- Integers in binary, octal and hexadecimal notations -->
diff --git a/skylighting-core/xml/fortran-free.xml b/skylighting-core/xml/fortran-free.xml
index b5dbbe14e..fa1fae0ac 100644
--- a/skylighting-core/xml/fortran-free.xml
+++ b/skylighting-core/xml/fortran-free.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Fortran (Free Format)" version="5" kateversion="5.53" section="Sources" extensions="*.f90;*.F90;*.f95;*.F95;*.f03;*.F03;*.f08;*.F08;" mimetype="text/x-fortran-src" casesensitive="0" author="Franchin Matteo (fnch@libero.it), Janus Weil" license="MIT" priority="10">
 <!-- Original author: Franchin Matteo (fnch@libero.it).
      Adaptation to free & fixed format: Janus Weil.
diff --git a/skylighting-core/xml/fsharp.xml b/skylighting-core/xml/fsharp.xml
index 0acde61b5..5b54d401a 100644
--- a/skylighting-core/xml/fsharp.xml
+++ b/skylighting-core/xml/fsharp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kate syntax highlighting for F# based on the OCAML syntax by Glyn Webster (glyn@wave.co.nz). -->
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 <!-- Regular expresion constants: -->
 <!ENTITY LETTER "A-Za-z\300-\326\330-\366\370-\377">                <!-- Latin-1 letters. -->
diff --git a/skylighting-core/xml/gcc.xml b/skylighting-core/xml/gcc.xml
index e40c27387..4c86005c5 100644
--- a/skylighting-core/xml/gcc.xml
+++ b/skylighting-core/xml/gcc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY space " ">
     <!ENTITY separators ",&#59;">
diff --git a/skylighting-core/xml/glsl.xml b/skylighting-core/xml/glsl.xml
index 241b4aefd..9f892f314 100644
--- a/skylighting-core/xml/glsl.xml
+++ b/skylighting-core/xml/glsl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="GLSL" section="3D" extensions="*.glsl;*.vert;*.vs;*.frag;*.fs;*.geom;*.gs;*.tcs;*.tes" mimetype="text/x-glslsrc" version="11" kateversion="5.0" author="Oliver Richers (o.richers@tu-bs.de)" license="LGPL" indenter="cstyle">
 	<!--
 		Based on GLSLangSpec.4.60.pdf
diff --git a/skylighting-core/xml/gnuassembler.xml b/skylighting-core/xml/gnuassembler.xml
index 35b976327..26a306c28 100644
--- a/skylighting-core/xml/gnuassembler.xml
+++ b/skylighting-core/xml/gnuassembler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
 
 *************************************************************************
diff --git a/skylighting-core/xml/go.xml b/skylighting-core/xml/go.xml
index 2e356c35e..6ee74eb5e 100644
--- a/skylighting-core/xml/go.xml
+++ b/skylighting-core/xml/go.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
   <!ENTITY hex "[0-9a-fA-F]">
   <!ENTITY int "(?:[0-9](?:_?[0-9]++)*+)">
   <!ENTITY hex_int "(?:[0-9A-Fa-f](?:_?[0-9A-Fa-f]++)*+)">
diff --git a/skylighting-core/xml/graphql.xml b/skylighting-core/xml/graphql.xml
index d8cfb690a..4cb0344d7 100644
--- a/skylighting-core/xml/graphql.xml
+++ b/skylighting-core/xml/graphql.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
   GraphQL: https://graphql.org/
   Synatx: https://github.com/graphql/graphql-spec/blob/master/spec/Section%202%20- -%20Language.md
diff --git a/skylighting-core/xml/groovy.xml b/skylighting-core/xml/groovy.xml
index c80018d23..40f165394 100644
--- a/skylighting-core/xml/groovy.xml
+++ b/skylighting-core/xml/groovy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)">
 	<!ENTITY hex "(?:[0-9a-fA-F]++(_++[0-9a-fA-F]++)*+)">
diff --git a/skylighting-core/xml/hamlet.xml b/skylighting-core/xml/hamlet.xml
index 473eb1503..446c56fa6 100644
--- a/skylighting-core/xml/hamlet.xml
+++ b/skylighting-core/xml/hamlet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!-- names must start with a letter, ideogram or underscore. \w matches any
   word character *or* a number, hence the lookahead -->
diff --git a/skylighting-core/xml/haskell.xml b/skylighting-core/xml/haskell.xml
index 20e4093a1..707e28aa4 100644
--- a/skylighting-core/xml/haskell.xml
+++ b/skylighting-core/xml/haskell.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
   <!ENTITY symbolops "\-!#\$&#37;&amp;\*\+/&lt;=&gt;\?&#92;@\^\|~\.:">
 ]>
 <language name="Haskell" version="20" kateversion="5.53" section="Sources" extensions="*.hs;*.chs;*.hs-boot" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell" style="haskell">
diff --git a/skylighting-core/xml/haxe.xml b/skylighting-core/xml/haxe.xml
index 6be29efce..2623f0a67 100644
--- a/skylighting-core/xml/haxe.xml
+++ b/skylighting-core/xml/haxe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
   ========================================================================
 
diff --git a/skylighting-core/xml/html.xml b/skylighting-core/xml/html.xml
index 499914d97..4a9993dab 100644
--- a/skylighting-core/xml/html.xml
+++ b/skylighting-core/xml/html.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY name          "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY attributeName "[A-Za-z_:*#\(\[][\)\]\w.:_-]*">
diff --git a/skylighting-core/xml/idris.xml b/skylighting-core/xml/idris.xml
index 57ec1bd30..99414093d 100644
--- a/skylighting-core/xml/idris.xml
+++ b/skylighting-core/xml/idris.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- Based on haskell.xml and idris.vim (https://github.com/idris-hackers/idris-vim/blob/6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1/syntax/idris.vim) -->
 <language name="Idris" version="7" kateversion="5.0" section="Sources" extensions="*.idr" author="Alexander Shabalin" license="LGPL">
   <highlighting>
diff --git a/skylighting-core/xml/ini.xml b/skylighting-core/xml/ini.xml
index 849b90e7e..9461aaf68 100644
--- a/skylighting-core/xml/ini.xml
+++ b/skylighting-core/xml/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc;.gitattributes*;.gitconfig*;.gitmodules*;.editorconfig*" mimetype="" version="12" kateversion="5.0" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
 
 <highlighting>
diff --git a/skylighting-core/xml/isocpp.xml b/skylighting-core/xml/isocpp.xml
index caf98afda..51905c361 100644
--- a/skylighting-core/xml/isocpp.xml
+++ b/skylighting-core/xml/isocpp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY int "(?:[0-9](?:'?[0-9]++)*+)">
     <!ENTITY hex_int "(?:[0-9A-Fa-f](?:'?[0-9A-Fa-f]++)*+)">
diff --git a/skylighting-core/xml/j.xml b/skylighting-core/xml/j.xml
index 6914de0b9..5c12252e2 100644
--- a/skylighting-core/xml/j.xml
+++ b/skylighting-core/xml/j.xml
@@ -35,7 +35,7 @@ Version 1.0 (2012-03-21) by Igor Zhuravlov
 - initial release
 
 -->
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!ENTITY unum "\d+">                                 <!-- Unsigned integer number -->
   <!ENTITY anum "[a-z\d]+">                            <!-- Non-10-based unsigned integer number, e.g. 1a -->
diff --git a/skylighting-core/xml/java.xml b/skylighting-core/xml/java.xml
index 478fb6ff3..a58f0f7f8 100644
--- a/skylighting-core/xml/java.xml
+++ b/skylighting-core/xml/java.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)">
 	<!ENTITY hex "(?:[0-9a-fA-F]++(_++[0-9a-fA-F]++)*+)">
diff --git a/skylighting-core/xml/javadoc.xml b/skylighting-core/xml/javadoc.xml
index 336fedd53..85b1f5e70 100644
--- a/skylighting-core/xml/javadoc.xml
+++ b/skylighting-core/xml/javadoc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Javadoc" version="6" kateversion="5.62" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<contexts>
diff --git a/skylighting-core/xml/javascript-react.xml b/skylighting-core/xml/javascript-react.xml
index 225c8807d..83cc17dad 100644
--- a/skylighting-core/xml/javascript-react.xml
+++ b/skylighting-core/xml/javascript-react.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY simpleName "(?:[a-z][a-z\d]*:)?[a-z][a-z\d]*">
 	<!ENTITY baseName   "[a-zA-Z_\$[:^ascii:]](?:[\w\$\-\.[:^ascii:]]*[\w\$[:^ascii:]])?">
diff --git a/skylighting-core/xml/javascript.xml b/skylighting-core/xml/javascript.xml
index 6a59f7001..6217f005b 100644
--- a/skylighting-core/xml/javascript.xml
+++ b/skylighting-core/xml/javascript.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!ENTITY identifier "[a-zA-Z_$[:^ascii:]][\w$[:^ascii:]]*">
 
diff --git a/skylighting-core/xml/json.xml b/skylighting-core/xml/json.xml
index 791a80813..471f4b7fb 100644
--- a/skylighting-core/xml/json.xml
+++ b/skylighting-core/xml/json.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
  ***************************************************************************
  ** Writing a Kate Highlighting XML File
diff --git a/skylighting-core/xml/jsp.xml b/skylighting-core/xml/jsp.xml
index e7055afc2..44f98e91c 100644
--- a/skylighting-core/xml/jsp.xml
+++ b/skylighting-core/xml/jsp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language version="9" kateversion="5.62" name="JSP" section="Markup" extensions="*.jsp;*.JSP" mimetype="text/html" casesensitive="false" author="Rob Martin (rob@gamepimp.com)" license="LGPL">
   <highlighting>
 
diff --git a/skylighting-core/xml/julia.xml b/skylighting-core/xml/julia.xml
index 3e89c7366..df800f207 100644
--- a/skylighting-core/xml/julia.xml
+++ b/skylighting-core/xml/julia.xml
@@ -27,16 +27,16 @@
   Author: Timothy E. Holy, Washington University in St. Louis
 -->
 
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
-  <!ENTITY int "[0-9]([0-9_]*[0-9])?">
-  <!ENTITY hex "[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?">
+  <!ENTITY int "[0-9]+(_[0-9]+)*">
+  <!ENTITY hex "[0-9a-fA-F]+(_[0-9a-fA-F]+)*">
   <!ENTITY function_disallowed_chars "\s.,(){}\[\];:&#37;'&quot;&amp;$=/?\|^#@">
   <!ENTITY function_disallowed_first_char "0-9!&function_disallowed_chars;">
   <!ENTITY function_begin_boundary "(?:(?&lt;=[&function_disallowed_chars;!]|^)(?=[^&function_disallowed_first_char;]))">
 ]>
 
-<language name="Julia" style="julia" indenter="julia" section="Sources" version="13" kateversion="5.0" extensions="*.jl" casesensitive="1" priority="5" license="MIT">
+<language name="Julia" style="julia" indenter="julia" section="Sources" version="14" kateversion="5.62" extensions="*.jl" casesensitive="1" priority="5" license="MIT">
 
   <highlighting>
     <list name="cflow_begin">
@@ -493,14 +493,15 @@
         <keyword context="controlflow-block" attribute="Control Flow" String="cflow_begin"
                  beginRegion="block" />
         <keyword context="#stay" attribute="Control Flow" String="cflow"/>
-        <keyword context="#stay" attribute="Keyword" String="block_end"
-                 endRegion="block" />
+        <WordDetect context="#stay" attribute="Keyword" String="end"
+                    endRegion="block" />
 
         <IncludeRules context="coderoot"/>
       </context>
 
       <context name="subsetting" attribute="Normal Text" lineEndContext="#stay">
-        <keyword context="#stay" attribute="Keyword" String="block_end"/>
+        <DetectSpaces attribute="Normal Text"/>
+        <WordDetect context="#stay" attribute="Keyword" String="end"/>
         <IncludeRules context="coderoot"/>
         <DetectChar attribute="Normal Text" context="#pop" char="]"/>
       </context>
@@ -543,718 +544,32 @@
         <StringDetect attribute="Command String" context="Block-Backtick-String" String="```" beginRegion="block-string"/>
         <DetectChar attribute="Command String" context="Backtick-String" char="`"/>
 
-        <!-- Multi-character operators
-        this was generated semi-automatically using operators in https://github.com/JuliaLang/julia/blob/master/src/julia-parser.scm -->
-        <StringDetect context="#stay" attribute="Operator" String="..."/>
+        <!-- Subsetting. This is needed because the `end` keyword has a special meaning in subsetting operations and should not be used for folding -->
+        <DetectChar attribute="Normal Text" context="subsetting" char="["/>
+
         <Detect2Chars context="type-annotation" attribute="Operator" char=":" char1=":"/>
-        <StringDetect context="#stay" attribute="Operator" String=".&gt;&gt;&gt;=" />
-        <StringDetect context="#stay" attribute="Operator" String="&gt;&gt;&gt;=" />
-        <StringDetect context="#stay" attribute="Operator" String=".&lt;--&gt;" />
-        <StringDetect context="#stay" attribute="Operator" String="&lt;--&gt;" />
-        <StringDetect context="#stay" attribute="Operator" String=".//=" />
-        <StringDetect context="#stay" attribute="Operator" String="//=" />
-        <StringDetect context="#stay" attribute="Operator" String=".&lt;&lt;=" />
-        <StringDetect context="#stay" attribute="Operator" String="&lt;&lt;=" />
-        <StringDetect context="#stay" attribute="Operator" String=".&gt;&gt;=" />
-        <StringDetect context="#stay" attribute="Operator" String="&gt;&gt;=" />
-        <StringDetect context="#stay" attribute="Operator" String=".--&gt;" />
-        <StringDetect context="#stay" attribute="Operator" String="--&gt;" />
-        <StringDetect context="#stay" attribute="Operator" String=".&lt;--" />
-        <StringDetect context="#stay" attribute="Operator" String="&lt;--" />
-        <StringDetect context="#stay" attribute="Operator" String=".===" />
-        <StringDetect context="#stay" attribute="Operator" String="===" />
-        <StringDetect context="#stay" attribute="Operator" String=".!==" />
-        <StringDetect context="#stay" attribute="Operator" String="!==" />
-        <StringDetect context="#stay" attribute="Operator" String=".&gt;&gt;&gt;" />
-        <StringDetect context="#stay" attribute="Operator" String="&gt;&gt;&gt;" />
-        <StringDetect context="#stay" attribute="Operator" String=".+=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="+" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".-=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="-" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".−=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="−" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".*=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="*" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String="./=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="/" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".\=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="\" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".^=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="^" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".÷=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="÷" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".%=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="%" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".|=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="|" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".&amp;=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="&amp;" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".⊻=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="⊻" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".:=" />
-        <Detect2Chars context="#stay" attribute="Operator" char=":" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".$=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="$" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".=&gt;" />
-        <Detect2Chars context="#stay" attribute="Operator" char="=" char1="&gt;"/>
-        <StringDetect context="#stay" attribute="Operator" String=".&amp;&amp;" />
-        <Detect2Chars context="#stay" attribute="Operator" char="&amp;" char1="&amp;"/>
-        <StringDetect context="#stay" attribute="Operator" String=".||" />
-        <Detect2Chars context="#stay" attribute="Operator" char="|" char1="|"/>
-        <StringDetect context="#stay" attribute="Operator" String=".&gt;=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="&gt;" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".&lt;=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="&lt;" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".==" />
-        <Detect2Chars context="#stay" attribute="Operator" char="=" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".!=" />
-        <Detect2Chars context="#stay" attribute="Operator" char="!" char1="="/>
-        <StringDetect context="#stay" attribute="Operator" String=".&lt;|" />
-        <Detect2Chars context="#stay" attribute="Operator" char="&lt;" char1="|"/>
-        <StringDetect context="#stay" attribute="Operator" String=".|&gt;" />
-        <Detect2Chars context="#stay" attribute="Operator" char="|" char1="&gt;"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="."/>
-        <StringDetect context="#stay" attribute="Operator" String=".++" />
-        <Detect2Chars context="#stay" attribute="Operator" char="+" char1="+"/>
-        <StringDetect context="#stay" attribute="Operator" String=".//" />
-        <Detect2Chars context="#stay" attribute="Operator" char="/" char1="/"/>
-        <StringDetect context="#stay" attribute="Operator" String=".&lt;&lt;" />
-        <Detect2Chars context="#stay" attribute="Operator" char="&lt;" char1="&lt;"/>
-        <StringDetect context="#stay" attribute="Operator" String=".&gt;&gt;" />
-        <Detect2Chars context="#stay" attribute="Operator" char="&gt;" char1="&gt;"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="="/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≔"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩴"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≕"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="~"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="←"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="→"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↔"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↚"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↛"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↞"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↠"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↢"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↣"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↦"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↤"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↮"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇎"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇍"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇏"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇐"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇒"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇔"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇴"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇸"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇹"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇾"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇿"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟵"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟹"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟾"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟿"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤀"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤁"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤂"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤃"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤄"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤅"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤆"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤇"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤌"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤍"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤎"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤏"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤐"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤑"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤔"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤕"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤖"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤗"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤘"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤞"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤟"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤠"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥄"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥅"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥆"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥇"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥈"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥊"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥎"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥐"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥒"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥓"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥖"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥗"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥚"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥛"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥞"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥟"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥢"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥤"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥦"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥧"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥨"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥩"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥪"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥫"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥬"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥭"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥰"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧴"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬱"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬰"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬲"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬳"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬴"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬵"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬸"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬹"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬾"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⬿"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭀"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭁"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭂"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭃"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭄"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭇"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭈"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭊"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⭌"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="￩"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="￫"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇜"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↜"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↩"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↪"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↫"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↬"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇀"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇁"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇄"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇆"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇇"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇌"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇚"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇛"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇠"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇢"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="&gt;"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="&lt;"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≥"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≤"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≡"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≠"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≢"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∈"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∌"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊆"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊈"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊂"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊄"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊊"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∊"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∍"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∥"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∦"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∾"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≁"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≃"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≂"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≄"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≅"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≆"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≇"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≈"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≊"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≌"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≍"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≎"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≐"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≑"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≒"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≓"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≖"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≗"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≘"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≙"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≚"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≛"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≜"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≞"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≟"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≣"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≦"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≧"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≨"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≩"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≪"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≫"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≬"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≭"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≮"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≯"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≰"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≱"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≲"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≳"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≴"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≵"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≸"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≹"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≾"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≿"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊀"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊁"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊃"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊅"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊇"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊏"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊐"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊑"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊒"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊜"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊩"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊬"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊮"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊰"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊱"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊲"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊳"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊴"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊵"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋍"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋐"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋑"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋕"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋖"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋗"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋘"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋙"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋚"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋛"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋜"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋞"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋟"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋠"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋡"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋢"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋣"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋤"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋥"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋦"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋧"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋨"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋩"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋪"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋫"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋬"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋭"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋲"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋳"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋴"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋵"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋸"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋹"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋾"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋿"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟈"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟒"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⦷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧀"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧁"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧡"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧣"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧤"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧥"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩦"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩧"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩪"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩫"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩬"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩭"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩮"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩯"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩰"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩱"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩲"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩳"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩵"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩸"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩹"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩾"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩿"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪀"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪁"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪂"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪃"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪄"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪅"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪆"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪇"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪈"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪊"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪌"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪍"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪎"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪏"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪐"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪑"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪒"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪓"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪔"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪕"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪖"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪗"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪘"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪙"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪚"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪛"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪜"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪞"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪟"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪠"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪡"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪢"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪣"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪤"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪥"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪦"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪧"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪨"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪩"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪪"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪫"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪬"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪭"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪮"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪯"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪰"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪱"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪲"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪳"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪴"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪵"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪸"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪹"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪾"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⪿"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫀"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫁"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫂"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫃"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫄"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫅"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫆"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫇"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫈"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫊"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫌"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫍"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫎"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫏"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫐"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫑"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫒"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫓"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫔"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫕"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫖"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫗"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫘"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫙"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫸"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫹"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊢"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊣"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟂"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫪"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫫"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="…"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⁝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋮"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋱"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋰"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋯"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="$"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="+"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="-"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="−"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="¦"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="|"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊕"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊖"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊞"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊟"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∪"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∨"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊔"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="±"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∓"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∔"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∸"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≏"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊎"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋎"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋓"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨈"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨢"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨣"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨤"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨥"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨦"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨧"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨨"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨩"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨪"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨫"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨬"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨭"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨮"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨹"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨺"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩁"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩂"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩅"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩊"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩌"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩏"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩐"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩒"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩔"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩖"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩗"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩛"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩡"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩢"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩣"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="*"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="/"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⌿"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="÷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="%"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="&amp;"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="·"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="·"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋅"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∘"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="×"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="\"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∩"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∧"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊗"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊘"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊙"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊚"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊛"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊠"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊡"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊓"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∗"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∙"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="∤"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⅋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="≀"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋄"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋆"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋇"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋊"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋌"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋏"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⋒"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟑"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⦸"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⦼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⦾"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⦿"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⧷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨇"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨰"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨱"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨲"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨳"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨴"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨵"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨶"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨸"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨻"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨼"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨽"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩀"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩃"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩄"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩍"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩎"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩑"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩓"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩕"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩘"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩚"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩜"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩞"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩟"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⩠"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⫛"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⊍"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="▷"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟕"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟖"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟗"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⨟"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="^"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↑"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="↓"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⇵"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟰"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⟱"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤈"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤊"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤋"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤒"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⤓"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥉"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥌"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥍"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥏"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥑"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥔"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥕"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥘"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥙"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥜"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥝"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥠"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥡"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥣"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥥"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥮"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="⥯"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="￪"/>
-        <Detect2Chars context="#stay" attribute="Operator" char="." char1="￬"/>
 
         <!-- subtype operator -->
         <Detect2Chars context="type-annotation" attribute="Operator" char="&lt;" char1=":"/>
 
-        <!-- Look-ahead for adjoint ' after variable, number literal, closing braces and .' -->
-        <RegExpr context="_adjoint" attribute="Variable" String="[a-zA-Z]\w*(?=')" />
-        <RegExpr context="_adjoint" attribute="Float" String="(&int;(\.&int;)?|\.&int;)([eEfF][+-]?\d+)?(im)?(?=')" />
-        <!-- <RegExpr context="_adjoint" attribute="Operator" String="\.'(?=')" /> -->
+        <!-- Character operators
+        this was generated semi-automatically using operators in https://github.com/JuliaLang/julia/blob/master/src/julia-parser.scm -->
+        <RegExpr context="#stay" attribute="Operator" String="\.\.\.?|[:$]=?|\.?(?:&gt;&gt;&gt;=|&lt;--&gt;|//=|&lt;&lt;=|&gt;&gt;=|--&gt;|&lt;--|===|!==|&gt;&gt;&gt;|[-+*/\\^÷%|&amp;⊻]=|=&gt;|&amp;&amp;|\|\|?|&gt;=|&lt;=|==|!=|&lt;\||\|&gt;|\+\+|//|&lt;&lt;|&gt;&gt;|&lt;:|&gt;:|[\Q=≔⩴≕~←→↔↚↛↞↠↢↣↦↤↮⇎⇍⇏⇐⇒⇔⇴⇶⇷⇸⇹⇺⇻⇼⇽⇾⇿⟵⟶⟷⟹⟺⟻⟼⟽⟾⟿⤀⤁⤂⤃⤄⤅⤆⤇⤌⤍⤎⤏⤐⤑⤔⤕⤖⤗⤘⤝⤞⤟⤠⥄⥅⥆⥇⥈⥊⥋⥎⥐⥒⥓⥖⥗⥚⥛⥞⥟⥢⥤⥦⥧⥨⥩⥪⥫⥬⥭⥰⧴⬱⬰⬲⬳⬴⬵⬶⬷⬸⬹⬺⬻⬼⬽⬾⬿⭀⭁⭂⭃⭄⭇⭈⭉⭊⭋⭌￩￫⇜⇝↜↝↩↪↫↬↼↽⇀⇁⇄⇆⇇⇉⇋⇌⇚⇛⇠⇢↷↶↺↻&gt;&lt;≥≤≡≠≢∈∉∋∌⊆⊈⊂⊄⊊∝∊∍∥∦∷∺∻∽∾≁≃≂≄≅≆≇≈≉≊≋≌≍≎≐≑≒≓≖≗≘≙≚≛≜≝≞≟≣≦≧≨≩≪≫≬≭≮≯≰≱≲≳≴≵≶≷≸≹≺≻≼≽≾≿⊀⊁⊃⊅⊇⊉⊋⊏⊐⊑⊒⊜⊩⊬⊮⊰⊱⊲⊳⊴⊵⊶⊷⋍⋐⋑⋕⋖⋗⋘⋙⋚⋛⋜⋝⋞⋟⋠⋡⋢⋣⋤⋥⋦⋧⋨⋩⋪⋫⋬⋭⋲⋳⋴⋵⋶⋷⋸⋹⋺⋻⋼⋽⋾⋿⟈⟉⟒⦷⧀⧁⧡⧣⧤⧥⩦⩧⩪⩫⩬⩭⩮⩯⩰⩱⩲⩳⩵⩶⩷⩸⩹⩺⩻⩼⩽⩾⩿⪀⪁⪂⪃⪄⪅⪆⪇⪈⪉⪊⪋⪌⪍⪎⪏⪐⪑⪒⪓⪔⪕⪖⪗⪘⪙⪚⪛⪜⪝⪞⪟⪠⪡⪢⪣⪤⪥⪦⪧⪨⪩⪪⪫⪬⪭⪮⪯⪰⪱⪲⪳⪴⪵⪶⪷⪸⪹⪺⪻⪼⪽⪾⪿⫀⫁⫂⫃⫄⫅⫆⫇⫈⫉⫊⫋⫌⫍⫎⫏⫐⫑⫒⫓⫔⫕⫖⫗⫘⫙⫷⫸⫹⫺⊢⊣⟂⫪⫫…⁝⋮⋱⋰⋯+-−¦|⊕⊖⊞⊟∪∨⊔±∓∔∸≏⊎⊻⊽⋎⋓⧺⧻⨈⨢⨣⨤⨥⨦⨧⨨⨩⨪⨫⨬⨭⨮⨹⨺⩁⩂⩅⩊⩌⩏⩐⩒⩔⩖⩗⩛⩝⩡⩢⩣*/⌿÷%&amp;··⋅∘×\∩∧⊗⊘⊙⊚⊛⊠⊡⊓∗∙∤⅋≀⊼⋄⋆⋇⋉⋊⋋⋌⋏⋒⟑⦸⦼⦾⦿⧶⧷⨇⨰⨱⨲⨳⨴⨵⨶⨷⨸⨻⨼⨽⩀⩃⩄⩋⩍⩎⩑⩓⩕⩘⩚⩜⩞⩟⩠⫛⊍▷⨝⟕⟖⟗⨟^↑↓⇵⟰⟱⤈⤉⤊⤋⤒⤓⥉⥌⥍⥏⥑⥔⥕⥘⥙⥜⥝⥠⥡⥣⥥⥮⥯￪￬\E])" />
+
+        <!-- Identifiers, numbers -->
+        <!-- We can't use HlCHex, Int, and Float because we need to allow the "im" at the end of complex numbers -->
+        <DetectIdentifier context="_adjoint" attribute="Variable" />
+        <RegExpr context="_adjoint" attribute="Float" String="0x(&hex;\.?|(&hex;)?\.&hex;)[pP][+-]?[0-9]+(im)?"/>
+        <RegExpr context="_adjoint" attribute="Hex" String="0x&hex;(im)?" />
+        <RegExpr context="_adjoint" attribute="Octal" String="0o[0-7]+(_[0-7]+)*(im)?" />
+        <RegExpr context="_adjoint" attribute="Binary" String="0b[01]+(_[01]+)*(im)?" />
+        <RegExpr context="_adjoint" attribute="Float" String="(&int;(\.&int;)?|\.&int;)([eEfF][+-]?\d+)?(im)?" />
 
         <!-- If ' is not the adjoint operator, it starts a character or an unterminated char -->
         <RegExpr context="#stay" attribute="Char" String="'[^']*(''[^']*)*'(?=[^']|$)" />
         <RegExpr context="#stay" attribute="Incomplete Char" String="'[^']*(''[^']*)*" />
 
         <RegExpr context="#stay" attribute="Macro" String="@[a-zA-Z_]\w*" />
-
-        <!-- Identifiers, numbers and braces -->
-        <!-- We can't use HlCHex, Int, and Float because we need to allow the "im" at the end of complex numbers -->
-        <DetectIdentifier context="#stay" attribute="Variable" />
-        <RegExpr context="#stay" attribute="Float" String="0x(&hex;\.?|(&hex;)?\.&hex;)[pP][+-]?\d+(im)?"/>
-        <RegExpr context="#stay" attribute="Hex" String="0x&hex;(im)?" />
-        <RegExpr context="#stay" attribute="Octal" String="0o[0-7]([0-7_]*[0-7])?(im)?" />
-        <RegExpr context="#stay" attribute="Binary" String="0b[01]([01_]*[01])?(im)?" />
-        <RegExpr context="#stay" attribute="Float" String="(&int;(\.&int;)?|\.&int;)([eEfF][+-]?\d+)?(im)?" />
-
-        <!-- Single-character operators
-        this was generated semi-automatically using operators in https://github.com/JuliaLang/julia/blob/master/src/julia-parser.scm -->
-        <AnyChar context="#stay" attribute="Operator" String="=≔⩴≕~←→↔↚↛↞↠↢↣↦↤↮⇎⇍⇏⇐⇒⇔⇴⇶⇷⇸⇹⇺⇻⇼⇽⇾⇿⟵⟶⟷⟹⟺⟻⟼⟽⟾⟿⤀⤁⤂⤃⤄⤅⤆⤇⤌⤍⤎⤏⤐⤑⤔⤕⤖⤗⤘⤝⤞⤟⤠⥄⥅⥆⥇⥈⥊⥋⥎⥐⥒⥓⥖⥗⥚⥛⥞⥟⥢⥤⥦⥧⥨⥩⥪⥫⥬⥭⥰⧴⬱⬰⬲⬳⬴⬵⬶⬷⬸⬹⬺⬻⬼⬽⬾⬿⭀⭁⭂⭃⭄⭇⭈⭉⭊⭋⭌￩￫⇜⇝↜↝↩↪↫↬↼↽⇀⇁⇄⇆⇇⇉⇋⇌⇚⇛⇠⇢↷↶↺↻&gt;&lt;≥≤≡≠≢∈∉∋∌⊆⊈⊂⊄⊊∝∊∍∥∦∷∺∻∽∾≁≃≂≄≅≆≇≈≉≊≋≌≍≎≐≑≒≓≖≗≘≙≚≛≜≝≞≟≣≦≧≨≩≪≫≬≭≮≯≰≱≲≳≴≵≶≷≸≹≺≻≼≽≾≿⊀⊁⊃⊅⊇⊉⊋⊏⊐⊑⊒⊜⊩⊬⊮⊰⊱⊲⊳⊴⊵⊶⊷⋍⋐⋑⋕⋖⋗⋘⋙⋚⋛⋜⋝⋞⋟⋠⋡⋢⋣⋤⋥⋦⋧⋨⋩⋪⋫⋬⋭⋲⋳⋴⋵⋶⋷⋸⋹⋺⋻⋼⋽⋾⋿⟈⟉⟒⦷⧀⧁⧡⧣⧤⧥⩦⩧⩪⩫⩬⩭⩮⩯⩰⩱⩲⩳⩵⩶⩷⩸⩹⩺⩻⩼⩽⩾⩿⪀⪁⪂⪃⪄⪅⪆⪇⪈⪉⪊⪋⪌⪍⪎⪏⪐⪑⪒⪓⪔⪕⪖⪗⪘⪙⪚⪛⪜⪝⪞⪟⪠⪡⪢⪣⪤⪥⪦⪧⪨⪩⪪⪫⪬⪭⪮⪯⪰⪱⪲⪳⪴⪵⪶⪷⪸⪹⪺⪻⪼⪽⪾⪿⫀⫁⫂⫃⫄⫅⫆⫇⫈⫉⫊⫋⫌⫍⫎⫏⫐⫑⫒⫓⫔⫕⫖⫗⫘⫙⫷⫸⫹⫺⊢⊣⟂⫪⫫…⁝⋮⋱⋰⋯:$+-−¦|⊕⊖⊞⊟∪∨⊔±∓∔∸≏⊎⊻⊽⋎⋓⧺⧻⨈⨢⨣⨤⨥⨦⨧⨨⨩⨪⨫⨬⨭⨮⨹⨺⩁⩂⩅⩊⩌⩏⩐⩒⩔⩖⩗⩛⩝⩡⩢⩣*/⌿÷%&amp;··⋅∘×\∩∧⊗⊘⊙⊚⊛⊠⊡⊓∗∙∤⅋≀⊼⋄⋆⋇⋉⋊⋋⋌⋏⋒⟑⦸⦼⦾⦿⧶⧷⨇⨰⨱⨲⨳⨴⨵⨶⨷⨸⨻⨼⨽⩀⩃⩄⩋⩍⩎⩑⩓⩕⩘⩚⩜⩞⩟⩠⫛⊍▷⨝⟕⟖⟗⨟^↑↓⇵⟰⟱⤈⤉⤊⤋⤒⤓⥉⥌⥍⥏⥑⥔⥕⥘⥙⥜⥝⥠⥡⥣⥥⥮⥯￪￬"/>
-
-        <!-- Subsetting. This is needed because the `end` keyword has a special meaning in subsetting operations and should not be used for folding -->
-        <DetectChar attribute="Normal Text" context="subsetting" char="["/>
       </context>
 
       <!-- Context for user block (#BEGIN...#END) -->
@@ -1262,9 +577,9 @@
         <IncludeRules context="1-comment" />
       </context>
 
-      <!-- Context entered after encountering an ' adjoint operator -->
-      <context name="_adjoint" attribute="Operator" lineEndContext="#pop">
-        <RegExpr context="#pop" attribute="Operator" String="'+" />
+      <!-- Context entered after encountering an identifier or a number -->
+      <context name="_adjoint" attribute="Operator" lineEndContext="#pop" fallthroughContext="#pop">
+        <DetectChar attribute="Operator" char="'" />
       </context>
 
       <!-- Context entered after encountering an " (string) -->
@@ -1361,16 +676,18 @@
 
       <!-- 1-line comment: #pop@EOL  -->
       <context name="1-comment" lineEndContext="#pop" attribute="Comment">
-        <DetectSpaces />
+        <DetectSpaces/>
+        <IncludeRules context="##Comments"/>
+        <DetectIdentifier/>
       </context>
 
       <context name="block-comment" lineEndContext="#stay" attribute="Comment">
-        <DetectSpaces />
         <Detect2Chars char="=" char1="#" context="#pop" attribute="Comment" endRegion="block-comment"/>
+        <IncludeRules context="1-comment" />
       </context>
       <context name="controlflow-block" lineEndContext="#stay" attribute="Normal Text">
         <keyword context="#stay" attribute="Control Flow" String="cflow_eb" endRegion="block" beginRegion="block" />
-        <keyword context="#pop" attribute="Control Flow" String="block_end" endRegion="block" />
+        <WordDetect context="#pop" attribute="Control Flow" String="end" endRegion="block" />
         <IncludeRules context="_normal" />
       </context>
       <context name="parametric-type" lineEndContext="#stay" attribute="Data Type">
@@ -1401,13 +718,19 @@
       </context>
 
       <!-- context for imports -->
-      <context name="import" lineEndContext="#stay" lineEmptyContext="#stay"  attribute="Normal Text">
+      <context name="import" lineEndContext="#stay" lineEmptyContext="#stay" attribute="Normal Text">
+        <DetectSpaces attribute="Normal Text"/>
+        <IncludeRules context="comment-rules"/>
+        <RegExpr attribute="Module" context="import_list" String="[^:,\s]+"/>
+      </context>
+      <context name="import_list" lineEndContext="#pop#pop" attribute="Normal Text">
+        <DetectSpaces attribute="Normal Text"/>
         <IncludeRules context="comment-rules"/>
-        <RegExpr attribute="Module" context="#stay" String="[^:,\s]+\s*(?=,)"/>
-        <RegExpr attribute="Module" context="import_vars" String="[^:,\s]+\s*(?=:)"/>
-        <RegExpr attribute="Module" context="#pop" String="[^:,\s]+\s*(?![,:])"/>
+        <DetectChar attribute="Normal Text" context="#pop" char=","/>
+        <DetectChar attribute="Normal Text" context="#pop!import_vars" char=":"/>
       </context>
       <context name="import_vars" lineEndContext="#stay" lineEmptyContext="#stay" attribute="Normal Text">
+        <DetectSpaces attribute="Normal Text"/>
         <IncludeRules context="comment-rules"/>
         <!-- we don't know if these are types, variables, or functions,
         so no highlighting here -->
diff --git a/skylighting-core/xml/kotlin.xml b/skylighting-core/xml/kotlin.xml
index 766faaefc..37d8d32d9 100644
--- a/skylighting-core/xml/kotlin.xml
+++ b/skylighting-core/xml/kotlin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)">
     <!ENTITY hex "(?:[0-9a-fA-F]++(_++[0-9a-fA-F]++)*+)">
diff --git a/skylighting-core/xml/latex.xml b/skylighting-core/xml/latex.xml
index 786c4dded..81fb36fbb 100644
--- a/skylighting-core/xml/latex.xml
+++ b/skylighting-core/xml/latex.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY bullet "&#xd7;">
     <!ENTITY envname "[a-zA-Z]+\*?">
 ]>
-<language name="LaTeX" version="20" section="Markup" kateversion="5.79" priority="10" extensions="*.tex;*.ltx;*.dtx;*.sty;*.cls;*.bbx;*.cbx;*.lbx;*.tikz;*.pgf" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)+Holger Danielsson (holger.danielsson@versanet.de)+Michel Ludwig (michel.ludwig@kdemail.net)+Thomas Braun (thomas.braun@virtuell-zuhause.de)" license="LGPL" >
+<language name="LaTeX" version="21" section="Markup" kateversion="5.79" priority="10" extensions="*.tex;*.ltx;*.dtx;*.sty;*.cls;*.bbx;*.cbx;*.lbx;*.tikz;*.pgf" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)+Holger Danielsson (holger.danielsson@versanet.de)+Michel Ludwig (michel.ludwig@kdemail.net)+Thomas Braun (thomas.braun@virtuell-zuhause.de)" license="LGPL" >
   <highlighting>
     <!-- NOTE: Keywords of kind "\something" do not need a delimiter before "\".
          Using a DetectChar rule with lookAhead to detect "\" at the beginning
@@ -3449,7 +3449,7 @@
       </context>
       <context name="HighlightingJavaScript" attribute="Normal Text" lineEndContext="#stay">
         <IncludeRules context="HighlightingCommon"/>
-        <IncludeRules context="##JavaScript" includeAttrib="true"/>
+        <IncludeRules context="Normal##JavaScript" includeAttrib="true"/>
       </context>
 
       <context name="HighlightingJCLCodeEnvS" attribute="Error" lineEndContext="#stay">
@@ -4841,7 +4841,7 @@
       </context>
       <context name="HighlightingQML" attribute="Normal Text" lineEndContext="#stay">
         <IncludeRules context="HighlightingCommon"/>
-        <IncludeRules context="##QML" includeAttrib="true"/>
+        <IncludeRules context="Normal##QML" includeAttrib="true"/>
       </context>
 
       <context name="HighlightingRelaxNG-CompactCodeEnvS" attribute="Error" lineEndContext="#stay">
@@ -5769,7 +5769,7 @@
       </context>
       <context name="HighlightingTypeScript" attribute="Normal Text" lineEndContext="#stay">
         <IncludeRules context="HighlightingCommon"/>
-        <IncludeRules context="##TypeScript" includeAttrib="true"/>
+        <IncludeRules context="Normal##TypeScript" includeAttrib="true"/>
       </context>
 
       <context name="HighlightingValaCodeEnvS" attribute="Error" lineEndContext="#stay">
diff --git a/skylighting-core/xml/lex.xml b/skylighting-core/xml/lex.xml
index 2e584c930..82c2b2cc5 100644
--- a/skylighting-core/xml/lex.xml
+++ b/skylighting-core/xml/lex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
   ========================================================================
 
diff --git a/skylighting-core/xml/lilypond.xml b/skylighting-core/xml/lilypond.xml
index bfacc0c18..58a4459db 100644
--- a/skylighting-core/xml/lilypond.xml
+++ b/skylighting-core/xml/lilypond.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
   <!ENTITY b "(?![A-Za-z])">
   <!ENTITY rest "\b[srR]&b;">
   <!ENTITY pitch "\b([a-h]((iss){1,2}|(ess){1,2}|(is){1,2}|(es){1,2}|(sharp){1,2}|(flat){1,2}|ss?|ff?)?|(do|re|mi|fa|sol|la|si)(dd?|bb?|ss?|kk?)?|q)('+|,+|&b;)">
diff --git a/skylighting-core/xml/literate-curry.xml b/skylighting-core/xml/literate-curry.xml
index 2b53db3ed..f8f642daf 100644
--- a/skylighting-core/xml/literate-curry.xml
+++ b/skylighting-core/xml/literate-curry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Literate Curry" version="6" kateversion="5.0"
           section="Sources" extensions="*.lcurry" mimetype="text/x-curry"
           author="Björn Peemöller (bjp@informatik.uni-kiel.de)" license="LGPL"
diff --git a/skylighting-core/xml/literate-haskell.xml b/skylighting-core/xml/literate-haskell.xml
index fd65f7625..a00a52782 100644
--- a/skylighting-core/xml/literate-haskell.xml
+++ b/skylighting-core/xml/literate-haskell.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Literate Haskell" version="9" kateversion="5.53" section="Sources" extensions="*.lhs" mimetype="text/x-literate-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL">
   <highlighting>
   <contexts>
diff --git a/skylighting-core/xml/llvm.xml b/skylighting-core/xml/llvm.xml
index db9c4bf31..1b0e53925 100644
--- a/skylighting-core/xml/llvm.xml
+++ b/skylighting-core/xml/llvm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="LLVM" section="Sources"
           version="4" kateversion="5.0"
           extensions="*.ll"
diff --git a/skylighting-core/xml/lua.xml b/skylighting-core/xml/lua.xml
index f83784b58..f8ad7a5c7 100644
--- a/skylighting-core/xml/lua.xml
+++ b/skylighting-core/xml/lua.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 <!ENTITY HEX "[0-9A-Fa-f]">
 ]>
diff --git a/skylighting-core/xml/m4.xml b/skylighting-core/xml/m4.xml
index 8af22d96e..508d35660 100644
--- a/skylighting-core/xml/m4.xml
+++ b/skylighting-core/xml/m4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
 
   GNU M4 syntax highlightning.
diff --git a/skylighting-core/xml/makefile.xml b/skylighting-core/xml/makefile.xml
index 257aac574..d132cf19e 100644
--- a/skylighting-core/xml/makefile.xml
+++ b/skylighting-core/xml/makefile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- Makefile syntaxfile v0.9 by Per Wigren <wigren@home.se> -->
 <!-- Modified by Joseph Wenninger <jowenn@kde.org> -->
 <!-- Modified by Rui Santana <santana.rui@gmail.com> -->
@@ -12,14 +12,18 @@
 <!-- v10 by Peter J. Mello <admin@petermello.net>
      Add recognition of POSIX 2013 '::=' operator for variable assignment -->
 <language name="Makefile" section="Other"
-          version="13" kateversion="5.0"
+          version="14" kateversion="5.0"
           extensions="GNUmakefile;Makefile;makefile;GNUmakefile.*;Makefile.*;makefile.*;*.mk"
           mimetype="text/x-makefile" priority="11"
           author="Per Wigren (wigren@home.se)" license="">
+
+  <!-- https://www.gnu.org/software/make/manual/make.pdf -->
+
   <highlighting>
-    <list name = "keywords" >
+    <list name="keywords" >
       <item>include</item>
       <item>-include</item>
+      <item>override</item>
       <item>define</item>
       <item>endef</item>
     </list>
@@ -177,9 +181,9 @@
         <keyword attribute="ControlFlow" String="gmake_else_keywords" context="gmake_else" endRegion="gmake_if" beginRegion="gmake_if" firstNonSpace="true"/>
         <keyword attribute="ControlFlow" String="gmake_endif_keywords" context="#stay" endRegion="gmake_if"/>
 
+        <RegExpr attribute="Variable" context="assign" String="(([+!?](?!=))?[^:#=\s+!?]*)++(?=\s*([+!?]|::?:?)?=)"/>
         <keyword attribute="Keyword"  context="#stay" String="keywords"/>
         <keyword attribute="Keyword"  context="bmake_other_stmts" String="bmake_other_stmts" firstNonSpace="true"/>
-        <RegExpr attribute="Variable" context="assign" String="[^\s+:?+]*\s*(?=::=|:=|=|\+=|\?=)"/>
         <keyword attribute="SpecialTarget" context="bmake_special_target" String="bmake_special_targets" firstNonSpace="true"/>
         <RegExpr attribute="SpecialTarget" context="prereq" String="\.PATH\.[^:]*:" firstNonSpace="true"/>
         <keyword attribute="Keyword" context="bmake_include" String="bmake_include_stmt" firstNonSpace="true"/>
@@ -277,6 +281,25 @@
         <Detect2Chars attribute="Special" context="#stay" char="\" char1="#"/>
         <Detect2Chars attribute="Special" context="#stay" char="\" char1="\"/>
         <DetectChar attribute="Comment" context="Comment" char="#"/>
+        <DetectChar attribute="Operator" context="inline-rule" char=";"/>
+      </context>
+
+      <context name="inline-rule" attribute="Normal" lineEndContext="#pop!rule" fallthroughContext="#pop!inline-rule-cmd" fallthrough="1">
+        <DetectSpaces/>
+        <LineContinue attribute="Operator" context="#stay"/>
+        <AnyChar attribute="Operator" context="silent" String="@-"/>
+      </context>
+      <context name="inline-rule-cmd" attribute="Normal" lineEndContext="#pop!rule">
+        <DetectSpaces/>
+        <DetectIdentifier/>
+        <DetectChar attribute="String" context="string&quot;" char="&quot;"/>
+        <DetectChar attribute="String" context="string'" char="'"/>
+        <DetectChar attribute="Operator" context="dollar" char="$"/>
+        <Detect2Chars attribute="Special" context="#stay" char="\" char1="#"/>
+        <Detect2Chars attribute="Special" context="#stay" char="\" char1="\"/>
+        <AnyChar attribute="Operator" context="silent" String="@-" firstNonSpace="1"/>
+        <DetectChar attribute="Comment" context="Comment" char="#"/>
+        <LineContinue attribute="Operator" context="#stay"/>
       </context>
 
       <context name="rule" attribute="Normal" lineEndContext="#stay">
@@ -321,6 +344,7 @@
       </context>
 
       <context name="assign" attribute="Operator" lineEndContext="#pop">
+        <DetectSpaces attribute="Normal"/>
         <DetectChar attribute="Operator" context="value" char="="/>
       </context>
 
@@ -328,7 +352,8 @@
         <LineContinue attribute="Operator"/>
         <DetectChar attribute="Operator" context="dollar" char="$"/>
         <RegExpr attribute="Special" context="#pop#pop" String="@[-_\d\w]*@"/>
-        <DetectChar attribute="Operator" char=";" context="#pop#pop"/>
+        <Detect2Chars attribute="String" char="\" char1="#"/>
+        <DetectChar attribute="Comment" context="#pop#pop!Comment" char="#"/>
       </context>
 
       <context name="dollar" attribute="Operator" lineEndContext="#pop">
@@ -454,6 +479,7 @@
         <DetectChar attribute="Operator" char=")" context="#pop#pop#pop"/>
         <DetectChar attribute="Operator" context="dollar" char="$"/>
         <DetectChar attribute="Keyword" context="#stay" char=","/>
+        <DetectChar attribute="String" context="string&quot;" char="&quot;"/>
         <DetectChar attribute="String" context="string'" char="'"/>
       </context>
 
@@ -461,6 +487,7 @@
         <DetectChar attribute="Operator" char="}" context="#pop#pop#pop"/>
         <DetectChar attribute="Operator" context="dollar" char="$"/>
         <DetectChar attribute="Keyword" context="#stay" char=","/>
+        <DetectChar attribute="String" context="string&quot;" char="&quot;"/>
         <DetectChar attribute="String" context="string'" char="'"/>
       </context>
 
diff --git a/skylighting-core/xml/mandoc.xml b/skylighting-core/xml/mandoc.xml
index 59a620616..005e3c24f 100644
--- a/skylighting-core/xml/mandoc.xml
+++ b/skylighting-core/xml/mandoc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Troff Mandoc" section="Markup" version="2" kateversion="5.0" extensions="*.1;*.2;*.3;*.4;*.5;*.6;*.7;*.8;*.1m;*.3x;*.tmac" mimetype="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
 
   <highlighting>
diff --git a/skylighting-core/xml/markdown.xml b/skylighting-core/xml/markdown.xml
index 8417a75a4..fd907442c 100644
--- a/skylighting-core/xml/markdown.xml
+++ b/skylighting-core/xml/markdown.xml
@@ -22,7 +22,7 @@
           Example: **bold text and _italic and bold text_**
                    __bold and ~~strikeout and bold~~__
 -->
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 <!-- NOTE: To correctly detect bold, italic or strike out text, use minimal="true" in RegExpr rules -->
 <!ENTITY contentregex_ast "(?:(?:[^\*\s\\]|\\.)(?:[^\\]|\\.)*)?(?:[^\*\s\\]|\\\S)">
@@ -90,7 +90,7 @@
 <!ENTITY checkbox "\[[ x]\](?=\s)">
 ]>
 
-<language name="Markdown" version="23" kateversion="5.79" section="Markup" extensions="*.md;*.mmd;*.markdown" priority="15" author="Darrin Yeager, Claes Holmerson" license="GPL,BSD">
+<language name="Markdown" version="26" kateversion="5.79" section="Markup" extensions="*.md;*.mmd;*.markdown" mimetype="text/markdown" priority="15" author="Darrin Yeager, Claes Holmerson" license="GPL,BSD">
   <highlighting>
     <contexts>
       <!-- Start of the Markdown document: find metadata or code block -->
@@ -149,40 +149,39 @@
       </context>
 
       <context name="find-header" attribute="Normal Text" lineEndContext="#pop">
-        <RegExpr attribute="Header H1" context="#pop!close-H2-region" String="^(#\s.*[#]?)$" column="0" endRegion="H1" beginRegion="H1" lookAhead="true"/>
-        <RegExpr attribute="Header H2" context="#pop!close-H3-region" String="^(##\s.*[#]?)$" column="0" endRegion="H2" beginRegion="H2" lookAhead="true"/>
-        <RegExpr attribute="Header H3" context="#pop!close-H4-region" String="^(###\s.*[#]?)$" column="0" endRegion="H3" beginRegion="H3" lookAhead="true"/>
-        <RegExpr attribute="Header H4" context="#pop!close-H5-region" String="^(####\s.*[#]?)$" column="0" endRegion="H4" beginRegion="H4" lookAhead="true"/>
-        <RegExpr attribute="Header H5" context="#pop!close-H6-region" String="^(#####\s.*[#]?)$" column="0" endRegion="H5" beginRegion="H5" lookAhead="true"/>
-        <RegExpr attribute="Header H6" context="#pop!close-sentinel-region" String="^(######\s.*[#]?)$" column="0" endRegion="H6" beginRegion="H6" lookAhead="true"/>
+        <RegExpr attribute="Header H1" context="#pop!close-H2-region" String="^#\s" column="0" endRegion="H1" beginRegion="H1" lookAhead="true"/>
+        <RegExpr attribute="Header H2" context="#pop!close-H3-region" String="^##\s" column="0" endRegion="H2" beginRegion="H2" lookAhead="true"/>
+        <RegExpr attribute="Header H3" context="#pop!close-H4-region" String="^###\s" column="0" endRegion="H3" beginRegion="H3" lookAhead="true"/>
+        <RegExpr attribute="Header H4" context="#pop!close-H5-region" String="^####\s" column="0" endRegion="H4" beginRegion="H4" lookAhead="true"/>
+        <RegExpr attribute="Header H5" context="#pop!close-H6-region" String="^#####\s" column="0" endRegion="H5" beginRegion="H5" lookAhead="true"/>
+        <RegExpr attribute="Header H6" context="#pop" String="^######\s.*" column="0" endRegion="H6" beginRegion="H6"/>
         <DetectChar attribute="Normal Text" context="#pop" char="#"/>
       </context>
       <!-- BUG: 441278 sub-headers should be closed when their parent header is closed  (e.g. in h1 h2 h3 h1, h1-h3 should all be closed at the 2nd h1) -->
       <!-- TODO: Port to a less hacky version (maybe a new attribute for declaring multiple endRegions)  -->
       <context name="close-H2-region" attribute="Header H2" lineEndContext="#pop!close-H3-region" fallthroughContext="#pop!close-H3-region">
-        <RegExpr attribute="Header H2" context="#pop!close-H3-region" String="(%1)" dynamic="true" lookAhead="true" endRegion="H2"/>
+        <DetectChar attribute="Header H2" context="#pop!close-H3-region" char="#" lookAhead="true" endRegion="H2"/>
       </context>
       <context name="close-H3-region" attribute="Header H3" lineEndContext="#pop!close-H4-region" fallthroughContext="#pop!close-H4-region">
-        <RegExpr attribute="Header H3" context="#pop!close-H4-region" String="(%1)" dynamic="true" lookAhead="true" endRegion="H3"/>
+        <DetectChar attribute="Header H3" context="#pop!close-H4-region" char="#" lookAhead="true" endRegion="H3"/>
       </context>
       <context name="close-H4-region" attribute="Header H4" lineEndContext="#pop!close-H5-region" fallthroughContext="#pop!close-H5-region">
-        <RegExpr attribute="Header H4" context="#pop!close-H5-region" String="(%1)" dynamic="true" lookAhead="true" endRegion="H4"/>
+        <DetectChar attribute="Header H4" context="#pop!close-H5-region" char="#" lookAhead="true" endRegion="H4"/>
       </context>
       <context name="close-H5-region" attribute="Header H5" lineEndContext="#pop!close-H6-region" fallthroughContext="#pop!close-H6-region">
-        <RegExpr attribute="Header H5" context="#pop!close-H6-region" String="(%1)" dynamic="true" lookAhead="true" endRegion="H5"/>
+        <DetectChar attribute="Header H5" context="#pop!close-H6-region" char="#" lookAhead="true" endRegion="H5"/>
       </context>
       <context name="close-H6-region" attribute="Header H6" lineEndContext="#pop" fallthroughContext="#pop">
-        <RegExpr attribute="Header H6" context="#pop!close-sentinel-region" String="(%1)" dynamic="true" lookAhead="true" endRegion="H6"/>
+        <DetectChar attribute="Header H6" context="#pop!close-sentinel-region" char="#" lookAhead="true" endRegion="H6"/>
       </context>
       <!-- This sentinel does not close any actual region, it's just here so that the proper attribute/highlighting is applied and -->
       <!--to ensure that H6 headers won't be set as the "primary" region that was closed just because it was closed last -->
       <context name="close-sentinel-region" attribute="Normal Text" lineEndContext="#pop" fallthroughContext="#pop">
-        <RegExpr attribute="Header H1" context="#pop" String="^(?=#\s)%1$" column="0" dynamic="true"/>
-        <RegExpr attribute="Header H2" context="#pop" String="^(?=##\s)%1$" column="0" dynamic="true"/>
-        <RegExpr attribute="Header H3" context="#pop" String="^(?=###\s)%1$" column="0" dynamic="true"/>
-        <RegExpr attribute="Header H4" context="#pop" String="^(?=####\s)%1$" column="0" dynamic="true"/>
-        <RegExpr attribute="Header H5" context="#pop" String="^(?=#####\s)%1$" column="0" dynamic="true"/>
-        <RegExpr attribute="Header H6" context="#pop" String="^(?=######\s)%1$" column="0" dynamic="true"/>
+        <RegExpr attribute="Header H1" context="#pop" String="^#\s.*" column="0"/>
+        <RegExpr attribute="Header H2" context="#pop" String="^##\s.*" column="0"/>
+        <RegExpr attribute="Header H3" context="#pop" String="^###\s.*" column="0"/>
+        <RegExpr attribute="Header H4" context="#pop" String="^####\s.*" column="0"/>
+        <RegExpr attribute="Header H5" context="#pop" String="^#####\s.*" column="0"/>
       </context>
 
 
@@ -313,41 +312,42 @@
       <!-- Fenced Code Blocks -->
       <context name="find-lang-fenced-code" attribute="Normal Text" lineEndContext="#pop">
         <!-- Apply syntax highlighting to fenced code blocks for some languages -->
-        <RegExpr attribute="Fenced Code" context="#pop!code" String="&fcode;&end;"/>
-        <RegExpr attribute="Fenced Code" context="#pop!bash-code" String="&fcode;\s*(?:bash(?:rc|_profile|_login|_logout)?|shell|sh|profile|PKGBUILD|APKBUILD|ebuild|eclass|nix)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!zsh-code" String="&fcode;\s*(?:zsh)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!cpp-code" String="&fcode;\s*(?:[ch]pp|[ch]\+\+|[ch]xx|h?cc|hh|cuh?|ino|pde|moc)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!csharp-code" String="&fcode;\s*(?:cs|csharp|c\#)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!cmake-code" String="&fcode;\s*(?:cmake|CMakeLists(?:\.txt)?)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!css-code" String="&fcode;\s*css&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!c-code" String="&fcode;\s*[ch]&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!doxygen-code" String="&fcode;\s*doxygen&end;" insensitive="true"/> <!-- Block comment of Doxygen -->
-        <RegExpr attribute="Fenced Code" context="#pop!email-code" String="&fcode;\s*(?:email|emlx?|mbo?x)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!go-code" String="&fcode;\s*go(?:lang)?&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!hamlet-code" String="&fcode;\s*[wxs]?hamlet&end;" insensitive="true"/> <!-- Included in the Haskell definition -->
-        <RegExpr attribute="Fenced Code" context="#pop!haskell-code" String="&fcode;\s*(?:haskell|c?hs|hs\-boot)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!html-code" String="&fcode;\s*(?:[sx]?html?|inc|tmpl|tpl)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!java-code" String="&fcode;\s*(?:java|bsh)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!javascript-code" String="&fcode;\s*(?:javascript|m?js|es6|kwinscript|julius)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!jsx-code" String="&fcode;\s*(?:jsx|tsx|(?:java|type)script\-react)&end;" insensitive="true"/> <!-- Included in the HTML definition. Also apply for TSX. -->
-        <RegExpr attribute="Fenced Code" context="#pop!json-code" String="&fcode;\s*(?:json5?|gltf)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!yaml-code" String="&fcode;\s*(?:ya?ml)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!matlab-code" String="&fcode;\s*matlab&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!markdown-code" String="&fcode;\s*(?:markdown|m?md)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!mustache-code" String="&fcode;\s*(?:handlebars|hbs|mustache|mst|ractive|hogan|hulk)&end;" insensitive="true"/> <!-- Included in the HTML definition -->
-        <RegExpr attribute="Fenced Code" context="#pop!perl-code" String="&fcode;\s*(?:perl|p[lm]|pod|psgi|vcl)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!php-code" String="&fcode;\s*(?:php[3457t]?|wml|phtml?|aw|ctp)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!python-code" String="&fcode;\s*(?:python[23]?|py[23w]?|[rc]py|sconstruct|gypi?)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!qml-code" String="&fcode;\s*qml(?:types)?&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!r-code" String="&fcode;\s*(?:r|rprofile|rscript)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!rest-code" String="&fcode;\s*(?:rst|rest|restructuredtext)&end;" insensitive="true"/> <!-- Included in the CMake definition -->
-        <RegExpr attribute="Fenced Code" context="#pop!ruby-code" String="&fcode;\s*(?:ruby|rbx?|rjs|rake|f?cgi|gemspec|irbrc|ru|prawn|Appraisals|(?:Rake|Cap|Chef|Gem|Guard|Hobo|Vagrant||Rant|Berks|Thor|Puppet)file|rxml|(?:xml|js)\.erb)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!rust-code" String="&fcode;\s*(?:rust|rs)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!mysql-code" String="&fcode;\s*(?:mysql|sql|ddl)&end;" insensitive="true"/> <!-- Included in the PHP definition -->
-        <RegExpr attribute="Fenced Code" context="#pop!nim-code" String="&fcode;\s*(?:nims?)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!typescript-code" String="&fcode;\s*(?:typescript|ts)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!xml-code" String="&fcode;\s*(?:xml|xsd|xspf|tld|jsp|c?pt|dtml|rss|opml|svg|daml|rdf|ui|kcfg|qrc|wsdl|scxml|xbel|dae|sch|brd|docbook)&end;" insensitive="true"/>
-        <RegExpr attribute="Fenced Code" context="#pop!code" String="&fcode;.*$"/>
+        <RegExpr attribute="Fenced Code" context="#pop!code" String="&fcode;&end;" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!bash-code" String="&fcode;\s*(?:bash(?:rc|_profile|_login|_logout)?|shell|sh|profile|PKGBUILD|APKBUILD|ebuild|eclass|nix)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!zsh-code" String="&fcode;\s*(?:zsh)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!cpp-code" String="&fcode;\s*(?:[ch]pp|[ch]\+\+|[ch]xx|h?cc|hh|cuh?|ino|pde|moc)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!csharp-code" String="&fcode;\s*(?:cs|csharp|c\#)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!cmake-code" String="&fcode;\s*(?:cmake|CMakeLists(?:\.txt)?)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!css-code" String="&fcode;\s*css&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!c-code" String="&fcode;\s*[ch]&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!doxygen-code" String="&fcode;\s*doxygen&end;" insensitive="true" beginRegion="code-block"/> <!-- Block comment of Doxygen -->
+        <RegExpr attribute="Fenced Code" context="#pop!email-code" String="&fcode;\s*(?:email|emlx?|mbo?x)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!go-code" String="&fcode;\s*go(?:lang)?&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!hamlet-code" String="&fcode;\s*[wxs]?hamlet&end;" insensitive="true" beginRegion="code-block"/> <!-- Included in the Haskell definition -->
+        <RegExpr attribute="Fenced Code" context="#pop!haskell-code" String="&fcode;\s*(?:haskell|c?hs|hs\-boot)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!html-code" String="&fcode;\s*(?:[sx]?html?|inc|tmpl|tpl)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!java-code" String="&fcode;\s*(?:java|bsh)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!javascript-code" String="&fcode;\s*(?:javascript|m?js|es6|kwinscript|julius)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!jsx-code" String="&fcode;\s*(?:jsx|tsx|(?:java|type)script\-react)&end;" insensitive="true" beginRegion="code-block"/> <!-- Included in the HTML definition. Also apply for TSX. -->
+        <RegExpr attribute="Fenced Code" context="#pop!json-code" String="&fcode;\s*(?:json5?|gltf)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!yaml-code" String="&fcode;\s*(?:ya?ml)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!matlab-code" String="&fcode;\s*matlab&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!markdown-code" String="&fcode;\s*(?:markdown|m?md)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!mustache-code" String="&fcode;\s*(?:handlebars|hbs|mustache|mst|ractive|hogan|hulk)&end;" insensitive="true" beginRegion="code-block"/> <!-- Included in the HTML definition -->
+        <RegExpr attribute="Fenced Code" context="#pop!perl-code" String="&fcode;\s*(?:perl|p[lm]|pod|psgi|vcl)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!php-code" String="&fcode;\s*(?:php[3457t]?|wml|phtml?|aw|ctp)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!python-code" String="&fcode;\s*(?:python[23]?|py[23w]?|[rc]py|sconstruct|gypi?)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!qml-code" String="&fcode;\s*qml(?:types)?&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!r-code" String="&fcode;\s*(?:r|rprofile|rscript)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!raku-code" String="&fcode;\s*(?:raku(?:mod|doc|test)?|perl6|p[lm]?6|pod6|nqp)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!rest-code" String="&fcode;\s*(?:rst|rest|restructuredtext)&end;" insensitive="true" beginRegion="code-block"/> <!-- Included in the CMake definition -->
+        <RegExpr attribute="Fenced Code" context="#pop!ruby-code" String="&fcode;\s*(?:ruby|rbx?|rjs|rake|f?cgi|gemspec|irbrc|ru|prawn|Appraisals|(?:Rake|Cap|Chef|Gem|Guard|Hobo|Vagrant||Rant|Berks|Thor|Puppet)file|rxml|(?:xml|js)\.erb)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!rust-code" String="&fcode;\s*(?:rust|rs)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!mysql-code" String="&fcode;\s*(?:mysql|sql|ddl)&end;" insensitive="true" beginRegion="code-block"/> <!-- Included in the PHP definition -->
+        <RegExpr attribute="Fenced Code" context="#pop!nim-code" String="&fcode;\s*(?:nims?)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!typescript-code" String="&fcode;\s*(?:typescript|ts)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!xml-code" String="&fcode;\s*(?:xml|xsd|xspf|tld|jsp|c?pt|dtml|rss|opml|svg|daml|rdf|ui|kcfg|qrc|wsdl|scxml|xbel|dae|sch|brd|docbook)&end;" insensitive="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="#pop!code" String="&fcode;.*$" beginRegion="code-block"/>
       </context>
       <context name="code" attribute="Code" lineEndContext="#stay"> <!-- Unknown language -->
         <RegExpr attribute="Fenced Code" context="#pop" String="%1[~`]*(?=&end;)" firstNonSpace="true" dynamic="true" endRegion="code-block"/>
@@ -450,7 +450,7 @@
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="qml-code">
         <IncludeRules context="code"/>
-        <IncludeRules context="##QML" includeAttrib="true"/>
+        <IncludeRules context="Normal##QML" includeAttrib="true"/>
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="r-code">
         <IncludeRules context="code"/>
@@ -490,7 +490,7 @@
         <!-- Code -->
         <RegExpr attribute="Code" String="`[^`]+`(?!`)|`{2}[^`](?:.*?[^`])?`{2}(?!`)|`{3}[^`](?:.*?[^`])?`{3}(?!`)|`{4}[^`](?:.*?[^`])?`{4}(?!`)|`{5,}[^`](?:.*?[^`])?`{5,}"/>
         <!-- Find Fenced Code Block -->
-        <RegExpr attribute="Fenced Code" context="find-lang-fenced-code" String="`{3,}(?=[^`]*$)|~{3,}(?=[^~]*$)" firstNonSpace="true" lookAhead="true" beginRegion="code-block"/>
+        <RegExpr attribute="Fenced Code" context="find-lang-fenced-code" String="`{3,}(?=[^`]*$)|~{3,}(?=[^~]*$)" firstNonSpace="true" lookAhead="true"/>
         <!-- Comment -->
         <StringDetect attribute="Comment" context="comment" String="&startcomment;" beginRegion="comment"/>
         <!-- Links and References -->
diff --git a/skylighting-core/xml/mathematica.xml b/skylighting-core/xml/mathematica.xml
index fcbb75589..6e7d7ca93 100644
--- a/skylighting-core/xml/mathematica.xml
+++ b/skylighting-core/xml/mathematica.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Mathematica" version="12" kateversion="5.0" section="Scientific"
           extensions="*.nb" mimetype="application/mathematica;application/vnd.wolfram.mathematica" indenter="cstyle"
           author="Sven Brauch (svenbrauch@gmail.com)" license="LGPL" priority="3">
diff --git a/skylighting-core/xml/matlab.xml b/skylighting-core/xml/matlab.xml
index 782410834..795686010 100644
--- a/skylighting-core/xml/matlab.xml
+++ b/skylighting-core/xml/matlab.xml
@@ -55,7 +55,7 @@
   Co-author: Leonardo Finetti, www.finex.org
 -->
 
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- low priority to let Objective-C win for .m files per default -->
 <language name="Matlab" version="8" kateversion="5.0" section="Scientific" extensions="*.m;*.M" priority="-9" mimetype="text/mfile" casesensitive="1">
   <highlighting>
diff --git a/skylighting-core/xml/maxima.xml b/skylighting-core/xml/maxima.xml
index 67a6b6432..44cc998b7 100644
--- a/skylighting-core/xml/maxima.xml
+++ b/skylighting-core/xml/maxima.xml
@@ -19,7 +19,7 @@
     Usage: place maxima.xml in $KDEDIR/share/apps/katepart/syntax.
 -->
 
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 
 <language name="Maxima" version="7" kateversion="5.2" section="Scientific" extensions="*.mac;*.MAC;*.dem;*.DEM" casesensitive="1" author="Alexey Beshenov &lt;al@beshenov.ru&gt;" license="LGPLv2.1+">
     <highlighting>
diff --git a/skylighting-core/xml/mediawiki.xml b/skylighting-core/xml/mediawiki.xml
index db8774eb7..50ec5ba94 100644
--- a/skylighting-core/xml/mediawiki.xml
+++ b/skylighting-core/xml/mediawiki.xml
@@ -1,5 +1,5 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
   <!ENTITY tab "&#9;">
   <!ENTITY url          "(http:|https:|ftp:|mailto:)[^]| ]*(?=$|[]|\s])">
   <!ENTITY htmlTagName  "(?![0-9])[\w_:][\w.:_-]*">
diff --git a/skylighting-core/xml/metafont.xml b/skylighting-core/xml/metafont.xml
index d9854931b..05315de64 100644
--- a/skylighting-core/xml/metafont.xml
+++ b/skylighting-core/xml/metafont.xml
@@ -5,10 +5,10 @@ files mp.vim and mf.vim
 We have moved some keywords for consistency
 -->
 
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
   <!ENTITY lengths "(bp|cc|cm|dd|in|mm|pc|pt)">
 ]>
-<language name="Metapost/Metafont" section="Markup" version="11" kateversion="5.0"
+<language name="Metapost/Metafont" section="Markup" version="12" kateversion="5.0"
 extensions="*.mp;*.mps;*.mpost;*.mf" mimetype="text/x-metapost" 
 author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
   <highlighting>
@@ -936,36 +936,36 @@ author="Yedvilun (yedvilun@gmail.com)" license="LGPL">
         <IncludeRules context="##Comments" />
         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
       </context>
+    </contexts>
 
-</contexts>
     <itemDatas>
       <itemData name="Normal Text" defStyleNum="dsNormal"/>
-      <itemData name="Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="0" italic="0"/>
-      <itemData name="Keyword Mathmode" defStyleNum="dsNormal" color="#606000" selColor="#FFD0FF" bold="0" italic="0"/>
+      <itemData name="Keyword" defStyleNum="dsFunction"/>
+      <itemData name="Keyword Mathmode" defStyleNum="dsFunction" italic="1"/>
       <itemData name="Comment" defStyleNum="dsComment"/>
 
       <itemData name="Error" defStyleNum="dsAlert"/>
-      <itemData name="Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF"  bold="0" italic="0"/>
+      <itemData name="Math" defStyleNum="dsSpecialString"/>
       <itemData name="TeX" defStyleNum="dsNormal"/>
       <itemData name="String" defStyleNum="dsString"/>
       <itemData name="Verbatim" defStyleNum="dsVerbatimString"/>
-      <itemData name="Macro"  defStyleNum="dsKeyword" color="#770000" selColor="#99FFFF" bold="0" italic="0"/>
+      <itemData name="Macro"  defStyleNum="dsKeyword"/>
       <itemData name="Operator" defStyleNum="dsOperator"/>
       <itemData name="Special" defStyleNum="dsKeyword" color="#008000" bold="0"/>
-      <itemData name="Conditional" defStyleNum="dsKeyword"/>
+      <itemData name="Conditional" defStyleNum="dsControlFlow"/>
 
-      <itemData name="Statement" defStyleNum="dsNormal" color="#0000FF" selColor="#FFFF00" bold="0" italic="0"/>
-      <itemData name="BoolExp" defStyleNum="dsKeyword" italic="1" bold="0" color="#AA00AA" selColor="#FFFF00"/>
-      <itemData name="NumExp" defStyleNum="dsFunction"/>
+      <itemData name="Statement" defStyleNum="dsAttribute"/>
+      <itemData name="BoolExp" defStyleNum="dsBuiltIn"/>
+      <itemData name="NumExp" defStyleNum="dsBuiltIn"/>
       <itemData name="Variable" defStyleNum="dsVariable"/>
-      <itemData name="Identifier" defStyleNum="dsKeyword"/>
+      <itemData name="Identifier" defStyleNum="dsRegionMarker"/>
       <itemData name="Type" defStyleNum="dsDataType"/>
       <itemData name="Decimal" defStyleNum="dsDecVal"/>
       <itemData name="Octal" defStyleNum="dsBaseN"/>
       <itemData name="Hex" defStyleNum="dsBaseN"/>
       <itemData name="Bullet" defStyleNum="dsExtension"/>
       <itemData name="Float" defStyleNum="dsFloat"/>
- </itemDatas>
+    </itemDatas>
   </highlighting>
 
   <general>
diff --git a/skylighting-core/xml/mips.xml b/skylighting-core/xml/mips.xml
index 7d6851810..905a6b7b3 100644
--- a/skylighting-core/xml/mips.xml
+++ b/skylighting-core/xml/mips.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="MIPS Assembler" version="6" kateversion="5.0" section="Assembler" extensions="*.s;" mimetype="text/x-mips" author="Dominik Haumann (dhaumann@kde.org)" license="MIT" priority="-1">
   <highlighting>
     <list name="type">
diff --git a/skylighting-core/xml/modelines.xml b/skylighting-core/xml/modelines.xml
index 43b49f338..855bca480 100644
--- a/skylighting-core/xml/modelines.xml
+++ b/skylighting-core/xml/modelines.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY space " ">
     <!ENTITY end "&#59;">
diff --git a/skylighting-core/xml/modula-2.xml b/skylighting-core/xml/modula-2.xml
index 15e9c508f..1760d0035 100644
--- a/skylighting-core/xml/modula-2.xml
+++ b/skylighting-core/xml/modula-2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Modula-2" mimetype="text/x-modula2" version="8"
   kateversion="5.0" section="Sources" priority="5" extensions="*.mod;*.def"
   casesensitive="1"  author="B. Kowarsch (trijezdci@github)"  license="MIT">
diff --git a/skylighting-core/xml/modula-3.xml b/skylighting-core/xml/modula-3.xml
index 8045bea65..8535d5ecf 100644
--- a/skylighting-core/xml/modula-3.xml
+++ b/skylighting-core/xml/modula-3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- author ik Iztok Kobal (iztok.kobal@siol.net) -->
 <!-- followed CM3 documentation (http://www.elegosoft.com/cm3/doc/reference/index.html , chapter Syntax) -->
 <!-- 03.03.2005 ik mailed version 1.00 to Dominik Haumann <dhdev@gmx.de> of kate team -->
diff --git a/skylighting-core/xml/monobasic.xml b/skylighting-core/xml/monobasic.xml
index ba0b55dd0..7b1ca9c66 100644
--- a/skylighting-core/xml/monobasic.xml
+++ b/skylighting-core/xml/monobasic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 
 <!--
     Mono Basic syntax
diff --git a/skylighting-core/xml/mustache.xml b/skylighting-core/xml/mustache.xml
index 0be27fc41..0fd95e0ce 100644
--- a/skylighting-core/xml/mustache.xml
+++ b/skylighting-core/xml/mustache.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY name          "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY attributeName "(?:\s|^)[A-Za-z_:\*#\(\[][\)\]\w\.:_-]*">
diff --git a/skylighting-core/xml/nasm.xml b/skylighting-core/xml/nasm.xml
index 924f01d96..9ad818f1d 100644
--- a/skylighting-core/xml/nasm.xml
+++ b/skylighting-core/xml/nasm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY float1 "0x[0-9a-f_]*+(?:(?:\.[0-9a-f_]*+)?p[-+]?[0-9_]++|\.[0-9a-f_]*+)">
     <!ENTITY float2 "0++p([0-9][0-9_]*+)?">
diff --git a/skylighting-core/xml/nim.xml b/skylighting-core/xml/nim.xml
index b85eeaafd..8d44863a9 100644
--- a/skylighting-core/xml/nim.xml
+++ b/skylighting-core/xml/nim.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 
 <!--
 Improvements:
diff --git a/skylighting-core/xml/nix.xml b/skylighting-core/xml/nix.xml
index 7b7b9f058..6d9be9036 100644
--- a/skylighting-core/xml/nix.xml
+++ b/skylighting-core/xml/nix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
     <!ENTITY ident "[a-zA-Z_][a-zA-Z0-9_\-']*">
 ]>
 
diff --git a/skylighting-core/xml/noweb.xml b/skylighting-core/xml/noweb.xml
index ed0aed971..b3f51c85e 100644
--- a/skylighting-core/xml/noweb.xml
+++ b/skylighting-core/xml/noweb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="noweb" version="5" kateversion="5.79" section="Sources" extensions="*.w;*.nw" author="Scott Collins (scc@scottcollins.net)">
 <!-- 
 #########################################################################
diff --git a/skylighting-core/xml/objectivec.xml b/skylighting-core/xml/objectivec.xml
index cb32c6680..bd7045968 100644
--- a/skylighting-core/xml/objectivec.xml
+++ b/skylighting-core/xml/objectivec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Objective-C" version="7" kateversion="5.0" section="Sources" extensions="*.m;*.h" mimetype="text/x-objc-src;text/x-c-hdr">
   <highlighting>
     <list name="keywords">
diff --git a/skylighting-core/xml/objectivecpp.xml b/skylighting-core/xml/objectivecpp.xml
index 64339cd22..01f2555a0 100644
--- a/skylighting-core/xml/objectivecpp.xml
+++ b/skylighting-core/xml/objectivecpp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Objective-C++" version="11" kateversion="5.0" section="Sources" extensions="*.mm;*.M;*.h" mimetype="text/x-objc++src;text/x-c-hdr" author="Gennady Telegin (gepo@lvk.cs.msu.su">
   <highlighting>
     <list name="keywords">
diff --git a/skylighting-core/xml/ocaml.xml b/skylighting-core/xml/ocaml.xml
index 863e33f49..0f14d8fc7 100644
--- a/skylighting-core/xml/ocaml.xml
+++ b/skylighting-core/xml/ocaml.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Kate syntax highlighting for Objective Caml version 4.02 in the standard and revised syntaxes, with Ocamldoc comments. -->
 
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 <!-- Regular expresion constants: -->
 <!ENTITY LOWER  "a-z\300-\326\330-\337">         <!-- Lowercase Latin-1 letters. -->
diff --git a/skylighting-core/xml/octave.xml b/skylighting-core/xml/octave.xml
index 8c539cb78..b1b63d8f0 100644
--- a/skylighting-core/xml/octave.xml
+++ b/skylighting-core/xml/octave.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
   =====================================================================================================
   Octave syntax highlighting file for the KDE editors Kate and Kwrite
diff --git a/skylighting-core/xml/opencl.xml b/skylighting-core/xml/opencl.xml
index 17397855a..d05b2bb03 100644
--- a/skylighting-core/xml/opencl.xml
+++ b/skylighting-core/xml/opencl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="OpenCL" section="Sources"
           version="9" kateversion="5.0"
           indenter="cstyle"
diff --git a/skylighting-core/xml/orgmode.xml b/skylighting-core/xml/orgmode.xml
index 238456aaa..b78c471ce 100644
--- a/skylighting-core/xml/orgmode.xml
+++ b/skylighting-core/xml/orgmode.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 <!ENTITY listbullet "[\+\-]">
 <!ENTITY checkbox "\[[ \-X]\](?=\s)">
diff --git a/skylighting-core/xml/pascal.xml b/skylighting-core/xml/pascal.xml
index bf172dfdb..a4f1d0c8e 100644
--- a/skylighting-core/xml/pascal.xml
+++ b/skylighting-core/xml/pascal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Pascal"
           section="Sources" 
           version="4"
diff --git a/skylighting-core/xml/perl.xml b/skylighting-core/xml/perl.xml
index b3822fe7b..ed843a7d4 100644
--- a/skylighting-core/xml/perl.xml
+++ b/skylighting-core/xml/perl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
    This file is part of the KDE project
    Copyright (C) 2001, 2002, 2003, 2004 Anders Lund <anders@alweb.dk>
diff --git a/skylighting-core/xml/php.xml b/skylighting-core/xml/php.xml
index 362f3b6cd..08a0eedeb 100644
--- a/skylighting-core/xml/php.xml
+++ b/skylighting-core/xml/php.xml
@@ -69,7 +69,7 @@ Changes:
 - Added alternative syntax control structures, and named logical operators ("and", "or", and "xor") (by Nicola Gigante).
 
 -->
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
   <!ENTITY types "integer|bool|boolean|float|double|real|string|array|object">
   <!ENTITY varid "[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*">
   <!ENTITY LNUM  "[0-9]++(_[0-9]++)*+">
diff --git a/skylighting-core/xml/pike.xml b/skylighting-core/xml/pike.xml
index 503d864f2..59775736a 100644
--- a/skylighting-core/xml/pike.xml
+++ b/skylighting-core/xml/pike.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- FIXME: Find a way to prevent ranges (e.g. [1..] or [0..99]) from matching as floats. -pp -->
 <language name="Pike" version="4" kateversion="5.0" section="Scripts" extensions="*.pike" mimetype="application/x-pike;text/x-pike" casesensitive="1" author="Paul Pogonyshev" license="">
   <highlighting>
diff --git a/skylighting-core/xml/postscript.xml b/skylighting-core/xml/postscript.xml
index 8e3a5a420..f6b337c62 100644
--- a/skylighting-core/xml/postscript.xml
+++ b/skylighting-core/xml/postscript.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="PostScript" version="4" kateversion="5.0" section="Markup" extensions="*.ps;*.ai;*.eps" mimetype="application/postscript">
 <highlighting>
 	<list name="keywords">
diff --git a/skylighting-core/xml/povray.xml b/skylighting-core/xml/povray.xml
index cb5cd4666..601b38ccd 100644
--- a/skylighting-core/xml/povray.xml
+++ b/skylighting-core/xml/povray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- Extended and updated by                                    -->
 <!-- Christoph Hormann <chris_hormann@gmx.de>, March 2004       -->
 <!-- features full POV-Ray 3.6 syntax with special highlighting -->
diff --git a/skylighting-core/xml/powershell.xml b/skylighting-core/xml/powershell.xml
index 01e4df3c7..45c2d0b56 100644
--- a/skylighting-core/xml/powershell.xml
+++ b/skylighting-core/xml/powershell.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language
   name="PowerShell"
   version="13"
diff --git a/skylighting-core/xml/prolog.xml b/skylighting-core/xml/prolog.xml
index 2ed518261..cbc4f75b7 100644
--- a/skylighting-core/xml/prolog.xml
+++ b/skylighting-core/xml/prolog.xml
@@ -29,7 +29,7 @@
  * Boston, MA  02110-1301, USA.                                       *
  **********************************************************************
 -->
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [<!-- [Regular Expressions, Character Classes & Important Tokens]
 E.g. the dot "." has so many different meanings (i.e. in an RegExpr 'any char',
 'fullstop' of a clause, etc. pp.) that I decided it's usefull to write these out
diff --git a/skylighting-core/xml/protobuf.xml b/skylighting-core/xml/protobuf.xml
index aa1ae3f4b..2c3acb1fd 100644
--- a/skylighting-core/xml/protobuf.xml
+++ b/skylighting-core/xml/protobuf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Protobuf" version="9" kateversion="5.0" section="Sources" extensions="*.proto" mimetype="text/x-protobuf" author="Slawomir Mikula (slawek.mikula@gmail.com)" license="LGPL">
   <highlighting>
     <list name="keywords">
diff --git a/skylighting-core/xml/pure.xml b/skylighting-core/xml/pure.xml
index 99992b358..98150ff59 100644
--- a/skylighting-core/xml/pure.xml
+++ b/skylighting-core/xml/pure.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
 
  Pure syntax highlighting for kate. Usage:
diff --git a/skylighting-core/xml/purebasic.xml b/skylighting-core/xml/purebasic.xml
index fce4625ff..9f1cd7fb7 100644
--- a/skylighting-core/xml/purebasic.xml
+++ b/skylighting-core/xml/purebasic.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd">
+<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language>
 <language name="PureBasic" version="10" kateversion="5.0" section="Sources" extensions="*.pb;*.pbi" mimetype="text/x-purebasic" author="Alexander Clay (Tuireann@EpicBasic.org);Sven Langenkamp (ace@kylixforum.de)" license="LGPL" priority="1" >
   <highlighting>
     <list name="keywords">
diff --git a/skylighting-core/xml/purescript.xml b/skylighting-core/xml/purescript.xml
index f6e5ffddf..f42c6a127 100644
--- a/skylighting-core/xml/purescript.xml
+++ b/skylighting-core/xml/purescript.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="PureScript" version="1" kateversion="5.53" section="Sources" extensions="*.purs" author="Gleb Popov (6yearold@gmail.com)" license="BSD3" indenter="haskell" style="haskell">
   <highlighting>
   <contexts>
diff --git a/skylighting-core/xml/python.xml b/skylighting-core/xml/python.xml
index f962189d4..ac4cc56bf 100644
--- a/skylighting-core/xml/python.xml
+++ b/skylighting-core/xml/python.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY digitPart "[0-9](?:_?[0-9])*">
 	<!ENTITY beforeDigit "(?&lt;![\.\w[:^ascii:]])">
diff --git a/skylighting-core/xml/qml.xml b/skylighting-core/xml/qml.xml
index 39ccaae5c..4e1341d67 100644
--- a/skylighting-core/xml/qml.xml
+++ b/skylighting-core/xml/qml.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!ENTITY identifier "[a-zA-Z_$][\w$]*">
 ]>
 <!-- Author: Milian Wolff <mail@milianw.de> -->
-<language name="QML" version="9" kateversion="5.53" section="Scripts" extensions="*.qml;*.qmltypes"
+<language name="QML" version="11" kateversion="5.53" section="Scripts" extensions="*.qml;*.qmltypes"
           mimetype="text/x-qml;application/x-qml" indenter="cstyle"
           author="Milian Wolff (mail@milianw.de)" license="MIT">
   <highlighting>
@@ -88,7 +88,9 @@
     </list>
     <!-- keywords not part of JavaScript -->
     <list name="extra-keywords">
+      <item>pragma</item>
       <item>readonly</item>
+      <item>required</item>
     </list>
     <list name="types">
       <!-- see: http://doc.trolltech.com/4.7-snapshot/qml-extending-types.html -->
@@ -104,6 +106,14 @@
       <item>variant</item>
     </list>
     <contexts>
+      <!-- Shebang: ("#!") Detect shebang and fallthrough to Normal -->
+      <!-- Based on the similar clause from prolog.xml.
+           This uses "lineEmptyContext" & "lineEndContext" to force the highlight only on the first line. -->
+      <context name="Shebang" attribute="Normal Text" lineEndContext="Normal" lineEmptyContext="Normal" fallthrough="true" fallthroughContext="Normal">
+        <Detect2Chars column="0" char="#" char1="!" context="Shebang Line" attribute="Shebang" />
+      </context>
+      <context name="Shebang Line" attribute="Shebang" lineEndContext="#pop!Normal" />
+
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
         <DetectSpaces/>
         <WordDetect attribute="Import" context="Import" String="import"/>
@@ -173,6 +183,7 @@
       <itemData name="String"       defStyleNum="dsString" />
       <itemData name="Objects"      defStyleNum="dsExtension" bold="0" spellChecking="false" />
       <itemData name="Symbol"       defStyleNum="dsOperator" spellChecking="false" />
+      <itemData name="Shebang"      defStyleNum="dsComment" spellChecking="false" />
     </itemDatas>
   </highlighting>
   <general>
diff --git a/skylighting-core/xml/r.xml b/skylighting-core/xml/r.xml
index f9ccb012e..15d69ff22 100644
--- a/skylighting-core/xml/r.xml
+++ b/skylighting-core/xml/r.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- Kate 2.5 (KDE 3.5) highlighting module for R
 	based on an earlier version by E.L. Willighagen. Code folding code by Ben Goodrich
 	version 2.0: (c) 2006 Thomas Friedrichsmeier, Arne Henningsen, and the RKWard Team
diff --git a/skylighting-core/xml/raku.xml b/skylighting-core/xml/raku.xml
index 47420ff37..3f7708fc3 100644
--- a/skylighting-core/xml/raku.xml
+++ b/skylighting-core/xml/raku.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!--
   identifier:
diff --git a/skylighting-core/xml/relaxng.xml b/skylighting-core/xml/relaxng.xml
index adb789365..ca995cba2 100644
--- a/skylighting-core/xml/relaxng.xml
+++ b/skylighting-core/xml/relaxng.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY qname    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&qname;);">
diff --git a/skylighting-core/xml/relaxngcompact.xml b/skylighting-core/xml/relaxngcompact.xml
index ce8ca6749..ae8d390ea 100644
--- a/skylighting-core/xml/relaxngcompact.xml
+++ b/skylighting-core/xml/relaxngcompact.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="RelaxNG-Compact" version="3" kateversion="5.0" section="Markup" extensions="*.rnc" casesensitive="1" author="Rintze Zelle" license="LGPL">
   <highlighting>
     <list name="Keywords">
diff --git a/skylighting-core/xml/rest.xml b/skylighting-core/xml/rest.xml
index b27f6b9aa..84f3157d8 100644
--- a/skylighting-core/xml/rest.xml
+++ b/skylighting-core/xml/rest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
         <!ENTITY inlinestart "(?:^|(?&lt;=[-\s&apos;&quot;\(\[{&lt;/:‘“’«¡¿‐‑‒–— ]))">
         <!ENTITY inlineend "(?=[-\s’”»‐‑‒–— &apos;&quot;\)\]}&gt;/:\.,;!\?\\]|$)">
diff --git a/skylighting-core/xml/rhtml.xml b/skylighting-core/xml/rhtml.xml
index 54aa09c2a..6b73ca7fa 100644
--- a/skylighting-core/xml/rhtml.xml
+++ b/skylighting-core/xml/rhtml.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(?:#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
diff --git a/skylighting-core/xml/roff.xml b/skylighting-core/xml/roff.xml
index a981a4434..57042ed74 100644
--- a/skylighting-core/xml/roff.xml
+++ b/skylighting-core/xml/roff.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!ENTITY roffidc "[^]\s]">
   <!ENTITY roffid  "(?:&roffidc;|\(&roffidc;{2}|\[&roffidc;+\])">
@@ -15,7 +15,7 @@
   <!ENTITY escape2 "\\[gkmMVYz]&roffid;">
   <!ENTITY escape3 "\\O([0-4]|\[5[lrci][^]]\])">
 ]>
-<language name="Roff" section="Markup" version="8" kateversion="5.0" extensions="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
+<language name="Roff" section="Markup" version="9" kateversion="5.0" extensions="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
 
   <highlighting>
 
@@ -83,6 +83,7 @@
       <context name="Comment" attribute="Comment" lineEndContext="#pop">
         <DetectSpaces />
         <IncludeRules context="##Comments"/>
+        <DetectIdentifier />
       </context>
 
       <!-- error -->
@@ -92,7 +93,6 @@
       <context name="Directive" attribute="Identifier" lineEndContext="#pop">
         <Float attribute="Number" context="#stay"/>
         <Int attribute="Number" context="#stay"/>
-        <Detect2Chars attribute="Comment" context="Comment" char="\" char1="&quot;"/>
         <IncludeRules context="DetectOthers"/>
       </context>
 
@@ -154,9 +154,8 @@
 
       <!-- .ds directive -->
       <context name="dsDirective" attribute="Identifier" lineEndContext="#pop">
-        <Int attribute="Number" context="#stay"/>
         <Float attribute="Number" context="#stay"/>
-        <Detect2Chars attribute="Comment" context="Comment" char="\" char1="&quot;"/>
+        <Int attribute="Number" context="#stay"/>
         <DetectChar attribute="String" context="dsString" char="&quot;"/>
         <IncludeRules context="DetectOthers"/>
       </context>
diff --git a/skylighting-core/xml/ruby.xml b/skylighting-core/xml/ruby.xml
index 0ac62ef45..7c1163910 100644
--- a/skylighting-core/xml/ruby.xml
+++ b/skylighting-core/xml/ruby.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 
 <!--
   Ruby syntax highlighting definition for Kate.
@@ -31,7 +31,7 @@
 
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
 <language name="Ruby" section="Scripts"
-	  version="17" kateversion="5.0"
+	  version="18" kateversion="5.0"
 	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec;Vagrantfile"
 	  mimetype="application/x-ruby"
 	  style="ruby" indenter="ruby"
@@ -360,6 +360,7 @@
 				<Detect2Chars attribute="String" char="\" char1="\" context="#stay"/>
 				<Detect2Chars attribute="String" char="\" char1="&quot;" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
+				<Detect2Chars attribute="Substitution" char="#" char1="$" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 				<DetectChar char="&quot;" attribute="String" context="check_div_1_pop"/>
 			</context>
@@ -374,6 +375,7 @@
 				<Detect2Chars attribute="String" char="\" char1="\" context="#stay"/>
 				<Detect2Chars attribute="String" char="\" char1="`" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
+				<Detect2Chars attribute="Substitution" char="#" char1="$" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 				<DetectChar char="`" attribute="Command" context="check_div_1_pop"/>
 			</context>
@@ -387,6 +389,7 @@
 			<context name="RegEx 1" attribute="Regular Expression" lineEndContext="#stay">
 				<Detect2Chars attribute="Regular Expression" char="\" char1="/" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
+				<Detect2Chars attribute="Substitution" char="#" char1="$" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 				<RegExpr attribute="Regular Expression" String="/[uiomxn]*" context="check_div_1_pop"/>
 			</context>
@@ -401,6 +404,7 @@
 			<context name="Short Subst" attribute="Substitution" lineEndContext="#pop">
 				<!-- Check for e.g.: "#@var#@@xy" -->
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="#stay"/>
+				<Detect2Chars attribute="Substitution" char="#" char1="$" context="#stay"/>
 				<RegExpr attribute="Substitution" String="\w(?!\w)" context="#pop"/>
 			</context>
 
@@ -459,6 +463,7 @@
 			<!-- rules for heredoc types -->
 			<context name="heredoc_rules" attribute="Normal Text" lineEndContext="#stay">
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
+				<Detect2Chars attribute="Substitution" char="#" char1="$" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 			</context>
 
@@ -595,6 +600,7 @@
 			<context name="dq_string_rules" attribute="String" lineEndContext="#stay" >
 				<Detect2Chars attribute="String" char="\" char1="\" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
+				<Detect2Chars attribute="Substitution" char="#" char1="$" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 			</context>
 
@@ -789,6 +795,7 @@
 			<context name="shell_command_rules" attribute="Command" lineEndContext="#stay" >
 				<Detect2Chars attribute="Command" char="\" char1="\" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
+				<Detect2Chars attribute="Substitution" char="#" char1="$" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 			</context>
 
@@ -855,6 +862,7 @@
 			<context name="regexpr_rules" attribute="Regular Expression" lineEndContext="#stay" >
 				<Detect2Chars attribute="Regular Expression" char="\" char1="\" context="#stay"/>
 				<RegExpr attribute="Substitution" String="#@{1,2}" context="Short Subst"/>
+				<Detect2Chars attribute="Substitution" char="#" char1="$" context="Short Subst"/>
 				<Detect2Chars attribute="Substitution" char="#" char1="{" context="Subst"/>
 			</context>
 
diff --git a/skylighting-core/xml/rust.xml b/skylighting-core/xml/rust.xml
index 2f47f6882..7068840a2 100644
--- a/skylighting-core/xml/rust.xml
+++ b/skylighting-core/xml/rust.xml
@@ -26,7 +26,7 @@
     IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
     DEALINGS IN THE SOFTWARE.
 -->
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY rustIdent "(?:[a-zA-Z_]|[^[:ascii:]])(?:\w|[^[:ascii:]])*">
 	<!ENTITY rustIntSuf "(?:[iu](?:8|16|32|64|128|size)?)?">
diff --git a/skylighting-core/xml/sass.xml b/skylighting-core/xml/sass.xml
index d3e9524b6..aa0b62054 100644
--- a/skylighting-core/xml/sass.xml
+++ b/skylighting-core/xml/sass.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!-- https://www.w3.org/TR/CSS22/syndata.html#tokenization -->
   <!ENTITY nmstart "[_a-zA-Z]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
   <!ENTITY nmchar  "[_a-zA-Z0-9-]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
 ]>
 
-<language name="SASS" version="6" kateversion="5.53" section="Markup" extensions="*.sass" indenter="cstyle" mimetype="text/css" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT" priority="5">
+<language name="SASS" version="7" kateversion="5.53" section="Markup" extensions="*.sass" indenter="cstyle" mimetype="text/css" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT" priority="5">
 
     <highlighting>
         <list name="properties">
@@ -34,7 +34,7 @@
             <context name="Base" attribute="Normal Text" lineEndContext="#stay">
                 <IncludeRules context="FindCommentsColumn0" />
                 <IncludeRules context="FindComments" />
-                <RegExpr attribute="Property" context="Rule" String="^\s*[-_A-Za-z]+(/\*.*\*/)?\s*(?=:(\s|$))" lookAhead="true" column="0" />
+                <RegExpr attribute="Property" context="Rule" String="^\s*[-_A-Za-z]+(/\*.*\*/)?\s*(?=:(\s|$))" lookAhead="true" column="0" minimal="true" />
                 <DetectSpaces />
                 <DetectChar attribute="At Rule" context="@mixin" char="=" firstNonSpace="true" />
                 <DetectChar attribute="At Rule" context="AtRule" char="+" firstNonSpace="true" />
diff --git a/skylighting-core/xml/scala.xml b/skylighting-core/xml/scala.xml
index 6c7a6c8c1..ffaba5400 100644
--- a/skylighting-core/xml/scala.xml
+++ b/skylighting-core/xml/scala.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Scala" version="11" kateversion="5.62" section="Sources"
           extensions="*.scala;*.sbt" mimetype="text/x-scala" license="LGPL"
           author="Stephane Micheloud (stephane.micheloud@epfl.ch)">
diff --git a/skylighting-core/xml/scheme.xml b/skylighting-core/xml/scheme.xml
index c6647812d..ea511126e 100644
--- a/skylighting-core/xml/scheme.xml
+++ b/skylighting-core/xml/scheme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!ENTITY xmlattrs "\s+([^&quot;/>]++|&quot;[^&quot;]*+&quot;)*+">
   <!ENTITY tab      "&#009;">
diff --git a/skylighting-core/xml/sci.xml b/skylighting-core/xml/sci.xml
index 1ce6877a6..1eadea68b 100644
--- a/skylighting-core/xml/sci.xml
+++ b/skylighting-core/xml/sci.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="scilab" version="6" kateversion="5.0" section="Scientific" extensions="*.sci;*.sce" mimetype="text/x-sci">
   <highlighting>
     <list name="Structure-keywords">
diff --git a/skylighting-core/xml/scss.xml b/skylighting-core/xml/scss.xml
index 818651384..dd91c6880 100644
--- a/skylighting-core/xml/scss.xml
+++ b/skylighting-core/xml/scss.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!-- https://www.w3.org/TR/CSS22/syndata.html#tokenization -->
   <!ENTITY nmstart "[_a-zA-Z]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
diff --git a/skylighting-core/xml/sed.xml b/skylighting-core/xml/sed.xml
index fa8c2ded5..4edd5695f 100644
--- a/skylighting-core/xml/sed.xml
+++ b/skylighting-core/xml/sed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="sed" section="Scripts" version="8" kateversion="5.0" extensions="*.sed" mimetype="text/x-sed" author="Bart Sas (bart.sas@gmail.com)" license="GPL">
         <highlighting>
                 <contexts>
diff --git a/skylighting-core/xml/sgml.xml b/skylighting-core/xml/sgml.xml
index 5f31252cd..46c9a9ace 100644
--- a/skylighting-core/xml/sgml.xml
+++ b/skylighting-core/xml/sgml.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="SGML" version="5" kateversion="5.0" section="Markup" extensions="*.sgml" mimetype="text/sgml">
   <highlighting>
     <contexts>
diff --git a/skylighting-core/xml/sml.xml b/skylighting-core/xml/sml.xml
index 53122b438..55949d5b2 100644
--- a/skylighting-core/xml/sml.xml
+++ b/skylighting-core/xml/sml.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="SML" version="6" kateversion="5.0" section="Sources" extensions="*.sml;*.ml" mimetype="" author="Christoph Cullmann (cullmann@kde.org)" license="MIT">
   <highlighting>
     <list name="keywords">
diff --git a/skylighting-core/xml/spdx-comments.xml b/skylighting-core/xml/spdx-comments.xml
index 7d8931192..2b89fc5ac 100644
--- a/skylighting-core/xml/spdx-comments.xml
+++ b/skylighting-core/xml/spdx-comments.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- ***** THIS FILE WAS GENERATED BY A SCRIPT - DO NOT EDIT *****
   cd data/generators
   # increase version of spdx-comments.xml.tpl then
diff --git a/skylighting-core/xml/sql-mysql.xml b/skylighting-core/xml/sql-mysql.xml
index 20b7607aa..32a51a552 100644
--- a/skylighting-core/xml/sql-mysql.xml
+++ b/skylighting-core/xml/sql-mysql.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
   MySQL syntax definition based on sql.xml by Yury Lebedev
   original by Shane Wright (me@shanewright.co.uk)
diff --git a/skylighting-core/xml/sql-postgresql.xml b/skylighting-core/xml/sql-postgresql.xml
index 81a0bb9aa..1a739b683 100644
--- a/skylighting-core/xml/sql-postgresql.xml
+++ b/skylighting-core/xml/sql-postgresql.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 
   <!-- Regular expression matching case-insensitively a single hexadecial digit. -->
diff --git a/skylighting-core/xml/sql.xml b/skylighting-core/xml/sql.xml
index 0e4ea90ad..f135e0577 100644
--- a/skylighting-core/xml/sql.xml
+++ b/skylighting-core/xml/sql.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!-- Oracle10g SQL and PL/SQL syntax - ANSI SQL 2003 superset -->
 <!-- This file is maintained by Anders Lund <anders@alweb.dk> since 2005-11-06
      v3 fix comments by Gene Thomas <gene@genethomas.com>
diff --git a/skylighting-core/xml/stan.xml b/skylighting-core/xml/stan.xml
index 156021229..befa2ae29 100644
--- a/skylighting-core/xml/stan.xml
+++ b/skylighting-core/xml/stan.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Stan"
           section="Scientific"
           version="5"
diff --git a/skylighting-core/xml/stata.xml b/skylighting-core/xml/stata.xml
index 43ba7fdae..56181c346 100644
--- a/skylighting-core/xml/stata.xml
+++ b/skylighting-core/xml/stata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Stata" version="12" kateversion="5.0" section="Scientific" extensions="*.do;*.ado;*.doh;*.DO;*.ADO;*.DOH"
  casesensitive="1" priority="5" author="Larry Radbill (Larry.Radbill gmail com)" license="LGPL" >
 
diff --git a/skylighting-core/xml/swift.xml b/skylighting-core/xml/swift.xml
index 373ae00a4..5ead38521 100644
--- a/skylighting-core/xml/swift.xml
+++ b/skylighting-core/xml/swift.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
     <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)">
     <!ENTITY hex "(?:[0-9a-fA-F]++(_++[0-9a-fA-F]++)*+)">
diff --git a/skylighting-core/xml/systemverilog.xml b/skylighting-core/xml/systemverilog.xml
index 44480f6ce..3d8508ddc 100644
--- a/skylighting-core/xml/systemverilog.xml
+++ b/skylighting-core/xml/systemverilog.xml
@@ -38,7 +38,7 @@
 <!-- $LastChangedRevision: 10 $                                             -->
 <!--                                                                       -->
 <!--***********************************************************************-->
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="SystemVerilog" version="11" kateversion="5.0" section="Hardware" extensions="*.sv;*.svh" mimetype="text/x-systemverilog-src" author="Sean O'Boyle (seanoboyle@intelligentdv.com)" license="GPLv3+">
   <highlighting>
     <list name="key_deprecated">
diff --git a/skylighting-core/xml/tcl.xml b/skylighting-core/xml/tcl.xml
index 60ccb60fa..479a2209c 100644
--- a/skylighting-core/xml/tcl.xml
+++ b/skylighting-core/xml/tcl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 
 <!-- Authors: Alexander Dederer & JM. Philippe -->
 <!-- Copyright: BSD copyright & Irsid - Arcelor Innovation R&D -->
diff --git a/skylighting-core/xml/tcsh.xml b/skylighting-core/xml/tcsh.xml
index ea71a4dd9..1ee6c9bbe 100644
--- a/skylighting-core/xml/tcsh.xml
+++ b/skylighting-core/xml/tcsh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
         <!ENTITY funcname "[A-Za-z_:][A-Za-z0-9_:#&#37;@-]*">
         <!ENTITY varname  "[A-Za-z_][A-Za-z0-9_]*">
diff --git a/skylighting-core/xml/texinfo.xml b/skylighting-core/xml/texinfo.xml
index 0898ef6bf..4e87593cd 100644
--- a/skylighting-core/xml/texinfo.xml
+++ b/skylighting-core/xml/texinfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Texinfo" extensions="*.texi" section="Markup" mimetype="application/x-texinfo" author="Daniel Franke (franke.daniel@gmail.com)" license="LGPL" version="3" kateversion="5.0">
 
   <highlighting>
diff --git a/skylighting-core/xml/toml.xml b/skylighting-core/xml/toml.xml
index 4e3bdc05b..9ef31a0c8 100644
--- a/skylighting-core/xml/toml.xml
+++ b/skylighting-core/xml/toml.xml
@@ -1,167 +1,182 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
-	<!ENTITY more "(_[0-9]++)*+">
-	<!ENTITY int  "(0|[1-9][0-9]*+&more;)">
-	<!ENTITY frac "\.[0-9]+&more;">
-	<!ENTITY exp  "[eE][+-]?[0-9]+&more;">
-	
-	<!ENTITY offset   "[+-][0-9][0-9]:[0-9][0-9]">
-	<!ENTITY time     "[0-9][0-9]:[0-9][0-9]:[0-9][0-9](\.[0-9]+)?">
-	<!ENTITY datetime "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]([T ]&time;(&offset;|Z)?)?|&time;">
+    <!ENTITY more "(_[0-9]++)*+">
+    <!ENTITY int  "(0|[1-9][0-9]*+&more;)">
+    <!ENTITY frac "\.[0-9]+&more;">
+    <!ENTITY exp  "[eE][+-]?[0-9]+&more;">
+
+    <!ENTITY offset   "[+-][0-9][0-9]:[0-9][0-9]">
+    <!ENTITY time     "[0-9][0-9]:[0-9][0-9]:[0-9][0-9](\.[0-9]+)?">
+    <!ENTITY datetime "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]([T ]&time;(&offset;|Z)?)?|&time;">
 ]>
 <!-- https://github.com/toml-lang/toml -->
 <!-- https://toml.io/en/v1.0.0 -->
-<language name="TOML" section="Configuration" extensions="*.toml" mimetype="text/x-toml;application/toml" version="10" kateversion="5.0" author="flying-sheep@web.de" license="LGPLv2+">
+<language
+    name="TOML"
+    section="Configuration"
+    extensions="Cargo.lock;*.toml"
+    mimetype="text/x-toml;application/toml"
+    version="12"
+    kateversion="5.0"
+    author="flying-sheep@web.de"
+    license="LGPLv2+"
+  >
 <highlighting>
-	<list name="bools">
-		<item>true</item>
-		<item>false</item>
-	</list>
-
-	<contexts>
-		<context attribute="Error" lineEndContext="#stay" name="Toml">
-			<DetectSpaces attribute="Whitespace"/>
-			<Detect2Chars attribute="TableHeader" context="NestedTableHeader" char="[" char1="[" endRegion="Table"/>
-			<DetectChar attribute="TableHeader" context="TableHeader" char="[" endRegion="Table"/>
-			<DetectChar attribute="Assignment" context="Value" char="="/>
-			<DetectChar char="#" attribute="Comment" context="Comment"/>
-			<IncludeRules context="FindKey"/>
-		</context>
-
-		<context attribute="Key" lineEndContext="#stay" name="FindKey">
-			<DetectChar attribute="TableHeader" char="."/>
-			<RegExpr    attribute="Key" context="#stay" String="[A-Za-z0-9_-]+"/>
-			<DetectChar attribute="Key" context="QuotedKey" char="&quot;"/>
-			<DetectChar attribute="Key" context="LitQuotedKey" char="'"/>
-		</context>
-
-
-		<!-- table headers -->
-		<context attribute="TableHeader" fallthrough="true" fallthroughContext="#pop" lineEndContext="#pop" name="TableHeader">
-			<DetectChar attribute="TableHeader" context="#pop" char="]" beginRegion="Table"/>
-			<IncludeRules context="TableHeaderCommon"/>
-		</context>
-
-		<context attribute="TableHeader" fallthrough="true" fallthroughContext="#pop" lineEndContext="#pop" name="NestedTableHeader">
-			<Detect2Chars attribute="TableHeader" context="#pop" char="]" char1="]" beginRegion="Table"/>
-			<IncludeRules context="TableHeaderCommon"/>
-		</context>
-
-		<context attribute="TableHeader" lineEndContext="#pop" name="TableHeaderCommon">
-			<DetectSpaces attribute="Whitespace"/>
-			<IncludeRules context="FindKey"/>
-		</context>
-
-
-		<!-- values -->
-		<context attribute="Error" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" name="Value">
-			<DetectSpaces attribute="Whitespace"/>
-			<keyword attribute="Bool" context="#pop" String="bools"/>
-			<StringDetect attribute="String" context="#pop!MultilineString"    String="&quot;&quot;&quot;"/>
-			<DetectChar   attribute="String" context="#pop!String"               char="&quot;"/>
-			<StringDetect attribute="String" context="#pop!LitMultilineString" String="'''"/>
-			<DetectChar   attribute="String" context="#pop!LitString"            char="'"/>
-			<DetectChar attribute="Array" context="#pop!Array" char="["/>
-			<DetectChar attribute="InlineTable" context="#pop!InlineTable" char="{"/>
-			<RegExpr attribute="Date"  context="#pop" String="&datetime;"/>
-			<RegExpr attribute="Int"   context="#pop" String="[+-]?(0x[0-9a-fA-F]+(_[0-9a-fA-F]+)*|0o[0-7]+(_[0-7]+)*|0b[01]+(_[01]+)*|&int;(?!(\.|[eE][+-]?)[0-9]))"/>
-			<RegExpr attribute="Float" context="#pop" String="[+-]?(&int;(&frac;(&exp;)?|&exp;)|inf|nan)"/>
-		</context>
-
-		<context attribute="Comment" lineEndContext="#pop" name="Comment">
-			<DetectSpaces/>
-			<IncludeRules context="##Comments"/>
-			<DetectIdentifier/>
-		</context>
-
-
-		<!-- Quoted keys and Strings-->
-		<context attribute="Key" lineEndContext="#pop" name="QuotedKey">
-			<DetectChar attribute="Key" context="#pop" char="&quot;"/>
-			<IncludeRules context="FindEscapedChar"/>
-		</context>
-
-		<context attribute="String" lineEndContext="#pop" name="String">
-			<DetectChar attribute="String" context="#pop" char="&quot;"/>
-			<IncludeRules context="FindEscapedChar"/>
-		</context>
-
-		<context attribute="String" lineEndContext="#stay" name="MultilineString">
-			<StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;&quot;&quot;"/>
-			<StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;&quot;"/>
-			<StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;"/>
-			<LineContinue attribute="Escape" context="#stay"/>
-			<IncludeRules context="FindEscapedChar"/>
-		</context>
-
-		<context attribute="String" lineEndContext="#pop" name="FindEscapedChar">
-			<RegExpr attribute="Escape" String="\\[btnfr&quot;\\]|\\u[0-9a-fA-F]{4}|\\U[0-9a-fA-F]{8}" context="#stay"/>
-			<RegExpr attribute="Error" String="\\[uU][0-9a-fA-F]*|\\." context="#stay"/>
-		</context>
-
-		<context attribute="Key" lineEndContext="#pop" name="LitQuotedKey">
-			<DetectChar attribute="Key" context="#pop" char="'"/>
-		</context>
-
-		<context attribute="LitString" lineEndContext="#pop" name="LitString">
-			<DetectChar attribute="String" context="#pop" char="'"/>
-		</context>
-
-		<context attribute="LitString" lineEndContext="#stay" name="LitMultilineString">
-			<StringDetect attribute="String" context="#pop" String="'''''"/>
-			<StringDetect attribute="String" context="#pop" String="''''"/>
-			<StringDetect attribute="String" context="#pop" String="'''"/>
-		</context>
-
-
-		<!-- Arrays -->
-		<context attribute="Array" lineEndContext="#stay" name="Array" fallthrough="true" fallthroughContext="InArray">
-			<DetectSpaces attribute="Whitespace"/>
-			<DetectChar context="#pop" attribute="Array" char="]"/>
-			<DetectChar context="InArray" attribute="NextEntry" char=","/>
-		</context>
-		<context attribute="Error" lineEndContext="#stay" name="InArray">
-			<DetectChar context="#pop#pop" attribute="Array" char="]"/>
-			<DetectChar context="#stay" attribute="Error" char=","/>
-			<DetectChar attribute="Comment" context="Comment" char="#"/>
-			<IncludeRules context="Value"/>
-		</context>
-
-		<context attribute="InlineTable" lineEndContext="#stay" name="InlineTable">
-			<DetectChar attribute="Assignment" context="Value" char="="/>
-			<DetectChar char="#" attribute="Comment" context="Comment"/>
-			<DetectChar context="#pop" attribute="InlineTable" char="}"/>
-			<DetectChar context="#stay" attribute="NextEntry" char=","/>
-			<IncludeRules context="FindKey"/>
-		</context>
-
-	</contexts>
-	<itemDatas>
-		<itemData name="Whitespace"  defStyleNum="dsNormal"/>
-		<itemData name="Key"         defStyleNum="dsDataType"/>
-		<itemData name="TableHeader" defStyleNum="dsKeyword"/>
-		<itemData name="Assignment"  defStyleNum="dsOperator"/>
-		<itemData name="Comment"     defStyleNum="dsComment"/>
-		
-		<itemData name="Date"        defStyleNum="dsBaseN"/>
-		<itemData name="Float"       defStyleNum="dsFloat"/>
-		<itemData name="Int"         defStyleNum="dsDecVal"/>
-		<itemData name="Bool"        defStyleNum="dsConstant"/>
-		<itemData name="String"      defStyleNum="dsString"/>
-		<itemData name="LitString"   defStyleNum="dsVerbatimString"/>
-		<itemData name="Escape"      defStyleNum="dsSpecialChar"/>
-		<itemData name="Array"       defStyleNum="dsOperator"/>
-		<itemData name="InlineTable" defStyleNum="dsOperator"/>
-		<itemData name="NextEntry"   defStyleNum="dsOperator"/>
-
-		<itemData name="Error"       defStyleNum="dsError"/>
-	</itemDatas>
+    <list name="bools">
+        <item>true</item>
+        <item>false</item>
+    </list>
+
+    <contexts>
+        <context attribute="Error" lineEndContext="#stay" name="Toml">
+            <DetectSpaces attribute="Whitespace"/>
+            <Detect2Chars attribute="TableHeader" context="NestedTableHeader" char="[" char1="[" endRegion="Table"/>
+            <DetectChar attribute="TableHeader" context="TableHeader" char="[" endRegion="Table"/>
+            <DetectChar attribute="Assignment" context="Value" char="="/>
+            <DetectChar char="#" attribute="Comment" context="Comment"/>
+            <IncludeRules context="FindKey"/>
+        </context>
+
+
+        <context attribute="Key" lineEndContext="#stay" name="FindKey">
+            <DetectChar attribute="Key" char="."/>
+            <RegExpr    attribute="Key" context="#stay" String="[A-Za-z0-9_-]+"/>
+            <DetectChar attribute="Key" context="QuotedKey" char="&quot;"/>
+            <DetectChar attribute="Key" context="LitQuotedKey" char="'"/>
+        </context>
+
+
+        <!-- table headers -->
+        <context attribute="TableHeader" fallthrough="true" fallthroughContext="#pop" lineEndContext="#pop" name="TableHeader">
+            <DetectChar attribute="TableHeader" context="#pop" char="]" beginRegion="Table"/>
+            <IncludeRules context="TableHeaderCommon"/>
+        </context>
+
+        <context attribute="TableHeader" fallthrough="true" fallthroughContext="#pop" lineEndContext="#pop" name="NestedTableHeader">
+            <Detect2Chars attribute="TableHeader" context="#pop" char="]" char1="]" beginRegion="Table"/>
+            <IncludeRules context="TableHeaderCommon"/>
+        </context>
+
+        <context attribute="TableHeader" lineEndContext="#pop" name="TableHeaderCommon">
+            <DetectSpaces attribute="Whitespace"/>
+            <DetectChar attribute="TableHeader" char="."/>
+            <RegExpr    attribute="TableHeader" context="#stay" String="[A-Za-z0-9_-]+"/>
+            <DetectChar attribute="TableHeader" context="QuotedKey" char="&quot;"/>
+            <DetectChar attribute="TableHeader" context="LitQuotedKey" char="'"/>
+        </context>
+
+
+        <!-- values -->
+        <context attribute="Error" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" name="Value">
+            <DetectSpaces attribute="Whitespace"/>
+            <WordDetect attribute="Boolean true" context="#pop" String="true"/>
+            <WordDetect attribute="Boolean false" context="#pop" String="false"/>
+            <StringDetect attribute="String" context="#pop!MultilineString"    String="&quot;&quot;&quot;"/>
+            <DetectChar   attribute="String" context="#pop!String"               char="&quot;"/>
+            <StringDetect attribute="String" context="#pop!LitMultilineString" String="'''"/>
+            <DetectChar   attribute="String" context="#pop!LitString"            char="'"/>
+            <DetectChar attribute="Array" context="#pop!Array" char="["/>
+            <DetectChar attribute="InlineTable" context="#pop!InlineTable" char="{"/>
+            <RegExpr attribute="Date"  context="#pop" String="&datetime;"/>
+            <RegExpr attribute="Int"   context="#pop" String="[+-]?(0x[0-9a-fA-F]+(_[0-9a-fA-F]+)*|0o[0-7]+(_[0-7]+)*|0b[01]+(_[01]+)*|&int;(?!(\.|[eE][+-]?)[0-9]))"/>
+            <RegExpr attribute="Float" context="#pop" String="[+-]?(&int;(&frac;(&exp;)?|&exp;)|inf|nan)"/>
+        </context>
+
+        <context attribute="Comment" lineEndContext="#pop" name="Comment">
+            <DetectSpaces/>
+            <IncludeRules context="##Comments"/>
+            <DetectIdentifier/>
+        </context>
+
+
+        <!-- Quoted keys and Strings-->
+        <context attribute="Key" lineEndContext="#pop" name="QuotedKey">
+            <DetectChar attribute="Key" context="#pop" char="&quot;"/>
+            <IncludeRules context="FindEscapedChar"/>
+        </context>
+
+        <context attribute="String" lineEndContext="#pop" name="String">
+            <DetectChar attribute="String" context="#pop" char="&quot;"/>
+            <IncludeRules context="FindEscapedChar"/>
+        </context>
+
+        <context attribute="String" lineEndContext="#stay" name="MultilineString">
+            <StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;&quot;&quot;"/>
+            <StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;&quot;"/>
+            <StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;"/>
+            <LineContinue attribute="Escape" context="#stay"/>
+            <IncludeRules context="FindEscapedChar"/>
+        </context>
+
+        <context attribute="String" lineEndContext="#pop" name="FindEscapedChar">
+            <RegExpr attribute="Escape" String="\\[btnfr&quot;\\]|\\u[0-9a-fA-F]{4}|\\U[0-9a-fA-F]{8}" context="#stay"/>
+            <RegExpr attribute="Error" String="\\[uU][0-9a-fA-F]*|\\." context="#stay"/>
+        </context>
+
+        <context attribute="Key" lineEndContext="#pop" name="LitQuotedKey">
+            <DetectChar attribute="Key" context="#pop" char="'"/>
+        </context>
+
+        <context attribute="LitString" lineEndContext="#pop" name="LitString">
+            <DetectChar attribute="String" context="#pop" char="'"/>
+        </context>
+
+        <context attribute="LitString" lineEndContext="#stay" name="LitMultilineString">
+            <StringDetect attribute="String" context="#pop" String="'''''"/>
+            <StringDetect attribute="String" context="#pop" String="''''"/>
+            <StringDetect attribute="String" context="#pop" String="'''"/>
+        </context>
+
+
+        <!-- Arrays -->
+        <context attribute="Array" lineEndContext="#stay" name="Array" fallthrough="true" fallthroughContext="InArray">
+            <DetectSpaces attribute="Whitespace"/>
+            <DetectChar context="#pop" attribute="Array" char="]"/>
+            <DetectChar attribute="Comment" context="Comment" char="#"/>
+            <DetectChar context="InArray" attribute="NextEntry" char=","/>
+        </context>
+        <context attribute="Error" lineEndContext="#stay" name="InArray">
+            <DetectChar context="#pop#pop" attribute="Array" char="]"/>
+            <DetectChar context="#stay" attribute="Error" char=","/>
+            <DetectChar attribute="Comment" context="Comment" char="#"/>
+            <IncludeRules context="Value"/>
+        </context>
+
+        <context attribute="InlineTable" lineEndContext="#stay" name="InlineTable">
+            <DetectChar attribute="Assignment" context="Value" char="="/>
+            <DetectChar char="#" attribute="Comment" context="Comment"/>
+            <DetectChar context="#pop" attribute="InlineTable" char="}"/>
+            <DetectChar context="#stay" attribute="NextEntry" char=","/>
+            <IncludeRules context="FindKey"/>
+        </context>
+
+    </contexts>
+    <itemDatas>
+        <itemData name="Whitespace"    defStyleNum="dsNormal"/>
+        <itemData name="Key"           defStyleNum="dsDataType"/>
+        <itemData name="TableHeader"   defStyleNum="dsKeyword"/>
+        <itemData name="Assignment"    defStyleNum="dsOperator"/>
+        <itemData name="Comment"       defStyleNum="dsComment"/>
+
+        <itemData name="Date"          defStyleNum="dsBaseN"/>
+        <itemData name="Float"         defStyleNum="dsFloat"/>
+        <itemData name="Int"           defStyleNum="dsDecVal"/>
+        <itemData name="Boolean true"  defStyleNum="dsConstant"/>
+        <itemData name="Boolean false" defStyleNum="dsConstant"/>
+        <itemData name="String"        defStyleNum="dsString"/>
+        <itemData name="LitString"     defStyleNum="dsVerbatimString"/>
+        <itemData name="Escape"        defStyleNum="dsSpecialChar"/>
+        <itemData name="Array"         defStyleNum="dsOperator"/>
+        <itemData name="InlineTable"   defStyleNum="dsOperator"/>
+        <itemData name="NextEntry"     defStyleNum="dsOperator"/>
+
+        <itemData name="Error"         defStyleNum="dsError"/>
+    </itemDatas>
 </highlighting>
 <general>
-	<comments>
-		<comment name="singleLine" start="#" position="afterwhitespace"/>
-	</comments>
+    <comments>
+        <comment name="singleLine" start="#" position="afterwhitespace"/>
+    </comments>
 </general>
 </language>
-<!-- kate: replace-tabs off; indent-width 2 -->
diff --git a/skylighting-core/xml/typescript.xml b/skylighting-core/xml/typescript.xml
index 935d04dcf..0250f7556 100644
--- a/skylighting-core/xml/typescript.xml
+++ b/skylighting-core/xml/typescript.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
-	<!ENTITY identifier     "[a-zA-Z_$[:^ascii:]][\w$[:^ascii:]]*">
+	<!ENTITY identifier     "[a-zA-Z_$[:^ascii:]][\w$[:^ascii:]]*+">
 	<!ENTITY numSuffix      "(?=n?(?:[^\w]|$))">
 	<!ENTITY objectOp       "[\?!]?">
 	<!ENTITY objectPoint    "\s*&objectOp;\.">
@@ -61,7 +61,7 @@
 -->
 
 <language name="TypeScript"
-          version="15"
+          version="16"
           kateversion="5.53"
           section="Scripts"
           extensions="*.ts;*.mts;*.cts"
diff --git a/skylighting-core/xml/verilog.xml b/skylighting-core/xml/verilog.xml
index 925b300ea..b789a98af 100644
--- a/skylighting-core/xml/verilog.xml
+++ b/skylighting-core/xml/verilog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="Verilog" version="8" kateversion="5.0" section="Hardware" extensions="*.v;*.V;*.vl" mimetype="text/x-verilog-src" author="Yevgen Voronenko (ysv22@drexel.edu), Ryan Dalzell (ryan@tullyroan.com)" license="">
   <highlighting>
     <list name="keywords">
diff --git a/skylighting-core/xml/vhdl.xml b/skylighting-core/xml/vhdl.xml
index 3d805eefe..d3b119326 100644
--- a/skylighting-core/xml/vhdl.xml
+++ b/skylighting-core/xml/vhdl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd" [
+<!DOCTYPE language [
   <!ENTITY varname  "[A-Za-z_][A-Za-z0-9_]*">
   <!ENTITY identifier "(?:\b&varname;\b|\\[^\\]*\\)">
   <!ENTITY designator "(?:\b&varname;\b|\\[^\\]*\\|&quot;[^&quot;]*&quot;)">
diff --git a/skylighting-core/xml/xml.xml b/skylighting-core/xml/xml.xml
index 94a0f4732..c2594eec6 100644
--- a/skylighting-core/xml/xml.xml
+++ b/skylighting-core/xml/xml.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!-- 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="18" kateversion="5.0" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml;*.xbel;*.dae;*.sch;*.brd" 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;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/gpx+xml" casesensitive="1" indenter="xml" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="XML" version="19" kateversion="5.0" section="Markup" extensions="*.page;*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml;*.xbel;*.dae;*.sch;*.brd" 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;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/gpx+xml" casesensitive="1" indenter="xml" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <highlighting>
 <contexts>
diff --git a/skylighting-core/xml/xorg.xml b/skylighting-core/xml/xorg.xml
index 2bbd0c7d4..0df90c0a8 100644
--- a/skylighting-core/xml/xorg.xml
+++ b/skylighting-core/xml/xorg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <language name="x.org Configuration" section="Configuration" extensions="xorg.conf" mimetype="" version="4" kateversion="5.0" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
 
 <highlighting>
diff --git a/skylighting-core/xml/xslt.xml b/skylighting-core/xml/xslt.xml
index 167968629..fb1864f76 100644
--- a/skylighting-core/xml/xslt.xml
+++ b/skylighting-core/xml/xslt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!ENTITY qname   "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
diff --git a/skylighting-core/xml/xul.xml b/skylighting-core/xml/xul.xml
index ac9950854..4be1b0f30 100644
--- a/skylighting-core/xml/xul.xml
+++ b/skylighting-core/xml/xul.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
diff --git a/skylighting-core/xml/yacc.xml b/skylighting-core/xml/yacc.xml
index 8b9391159..4129a09bd 100644
--- a/skylighting-core/xml/yacc.xml
+++ b/skylighting-core/xml/yacc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language>
 <!--
 ========================================================================
 YACC.XML supports syntax highlighting for Yacc/Bison source under Kate.
diff --git a/skylighting-core/xml/yaml.xml b/skylighting-core/xml/yaml.xml
index 71f4739d0..120dbd55f 100644
--- a/skylighting-core/xml/yaml.xml
+++ b/skylighting-core/xml/yaml.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
   <!ENTITY null "(?:null|Null|NULL|~)">
   <!ENTITY bool "(?:y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)">
diff --git a/skylighting-core/xml/zsh.xml b/skylighting-core/xml/zsh.xml
index 4553fb095..8abf9903a 100644
--- a/skylighting-core/xml/zsh.xml
+++ b/skylighting-core/xml/zsh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd"
+<!DOCTYPE language
 [
         <!ENTITY tab      "&#009;">
         <!ENTITY funcname "[^&_fragpathseps;=]*+">