diff --git a/changelog.md b/changelog.md
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,24 @@
 # Revision history for skylighting and skylighting-core
 
+## 0.10.2
+
+  * Update syntax definitions for abc, actionscript, asn1, ats,
+    bash, boo, coffee, comments, cpp, cs, css, curry, d,
+    djangotemplate, dockerfile, doxygen, dtd, elixir, graphql,
+    groovy, hamlet, haskell, haxe, idris, ini, j, java,
+    javadoc, javascript-react, javascript, jsp, kotlin, lex,
+    lilypond, literate-curry, literate-haskell, m4, makefile,
+    mandoc, markdown, mediawiki, mips, modula-2, modula-3,
+    monobasic, mustache, nim, noweb, objectivec, objectivecpp,
+    ocaml, opencl, pascal, perl, php, pike, postscript,
+    prolog, protobuf, pure, purebasic, python, qml, relaxng,
+    relaxngcompact, rest, rhtml, roff, ruby, scala, sci, sed,
+    sgml, sml, spdx-comments, stata, tcsh, texinfo, verilog,
+    xml, xorg, xul.
+
+  * Re-insert CSS line needed to make line numbers appear in
+    HTML.  See jgm/pandoc#6625.
+
 ## 0.10.1
 
   * Regex: handle `(?|)` modifier.  This is used in bash.xml now.
diff --git a/skylighting-core.cabal b/skylighting-core.cabal
--- a/skylighting-core.cabal
+++ b/skylighting-core.cabal
@@ -1,5 +1,5 @@
 name:                skylighting-core
-version:             0.10.1
+version:             0.10.2
 synopsis:            syntax highlighting library
 description:         Skylighting is a syntax highlighting library.
                      It derives its tokenizers from XML syntax
diff --git a/src/Skylighting/Format/HTML.hs b/src/Skylighting/Format/HTML.hs
--- a/src/Skylighting/Format/HTML.hs
+++ b/src/Skylighting/Format/HTML.hs
@@ -183,6 +183,7 @@
             "pre > code.sourceCode { white-space: pre; position: relative; }" -- position relative needed for relative contents
           , "pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }"
           , "pre > code.sourceCode > span:empty { height: 1.2em; }" -- correct empty line height
+          , ".sourceCode { overflow: visible; }" -- needed for line numbers
           , "code.sourceCode > span { color: inherit; text-decoration: inherit; }"
           , "div.sourceCode { margin: 1em 0; }" -- Collapse neighbours correctly
           , "pre.sourceCode { margin: 0; }" -- Collapse neighbours correctly
diff --git a/test/expected/abc.java.native b/test/expected/abc.java.native
--- a/test/expected/abc.java.native
+++ b/test/expected/abc.java.native
@@ -1,11 +1,18 @@
 [ [ ( KeywordTok , "import" )
-  , ( ImportTok , " java.util.Arrays;" )
+  , ( NormalTok , " " )
+  , ( ImportTok , "java" )
+  , ( OperatorTok , "." )
+  , ( ImportTok , "util" )
+  , ( OperatorTok , "." )
+  , ( ImportTok , "Arrays" )
+  , ( OperatorTok , ";" )
   ]
 , []
 , [ ( KeywordTok , "public" )
   , ( NormalTok , " " )
   , ( KeywordTok , "class" )
-  , ( NormalTok , " ABC{" )
+  , ( NormalTok , " ABC" )
+  , ( OperatorTok , "{" )
   ]
 , [ ( NormalTok , "        " )
   , ( KeywordTok , "private" )
@@ -15,22 +22,50 @@
   , ( DataTypeTok , "void" )
   , ( NormalTok , " " )
   , ( FunctionTok , "swap" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DataTypeTok , "int" )
-  , ( NormalTok , " i, " )
+  , ( NormalTok , " i" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( DataTypeTok , "int" )
-  , ( NormalTok , " j, " )
+  , ( NormalTok , " j" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( BuiltInTok , "Object" )
-  , ( KeywordTok , "... " )
-  , ( NormalTok , "arr){" )
+  , ( KeywordTok , "..." )
+  , ( NormalTok , " arr" )
+  , ( OperatorTok , "){" )
   ]
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "Object" )
-  , ( NormalTok , " tmp = arr[i];" )
+  , ( NormalTok , " tmp " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " arr" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "i" )
+  , ( OperatorTok , "];" )
   ]
-, [ ( NormalTok , "                arr[i] = arr[j];" ) ]
-, [ ( NormalTok , "                arr[j] = tmp;" ) ]
-, [ ( NormalTok , "        }" ) ]
+, [ ( NormalTok , "                arr" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "i" )
+  , ( OperatorTok , "]" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " arr" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "j" )
+  , ( OperatorTok , "];" )
+  ]
+, [ ( NormalTok , "                arr" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "j" )
+  , ( OperatorTok , "]" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " tmp" )
+  , ( OperatorTok , ";" )
+  ]
+, [ ( NormalTok , "        " ) , ( OperatorTok , "}" ) ]
 , [ ( NormalTok , "        " ) ]
 , [ ( NormalTok , "        " )
   , ( KeywordTok , "public" )
@@ -40,123 +75,181 @@
   , ( DataTypeTok , "boolean" )
   , ( NormalTok , " " )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( BuiltInTok , "String" )
-  , ( NormalTok , " word, " )
+  , ( NormalTok , " word" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( BuiltInTok , "String" )
-  , ( KeywordTok , "... " )
-  , ( NormalTok , "blocks) {" )
+  , ( KeywordTok , "..." )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , [ ( NormalTok , "            " )
-  , ( KeywordTok , "if" )
-  , ( NormalTok , "(word." )
+  , ( ControlFlowTok , "if" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "length" )
-  , ( NormalTok , "() == " )
+  , ( OperatorTok , "()" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "==" )
+  , ( NormalTok , " " )
   , ( DecValTok , "0" )
-  , ( NormalTok , ")" )
+  , ( OperatorTok , ")" )
   ]
 , [ ( NormalTok , "                " )
-  , ( KeywordTok , "return" )
+  , ( ControlFlowTok , "return" )
   , ( NormalTok , " " )
   , ( KeywordTok , "true" )
-  , ( NormalTok , ";" )
+  , ( OperatorTok , ";" )
   ]
 , [ ( NormalTok , "         " ) ]
 , [ ( NormalTok , "            " )
   , ( DataTypeTok , "char" )
-  , ( NormalTok , " c = " )
+  , ( NormalTok , " c " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
   , ( BuiltInTok , "Character" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "toUpperCase" )
-  , ( NormalTok , "(word." )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "charAt" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "0" )
-  , ( NormalTok , "));" )
+  , ( OperatorTok , "));" )
   ]
 , [ ( NormalTok , "            " )
-  , ( KeywordTok , "for" )
-  , ( NormalTok , "(" )
+  , ( ControlFlowTok , "for" )
+  , ( OperatorTok , "(" )
   , ( DataTypeTok , "int" )
-  , ( NormalTok , " i = " )
+  , ( NormalTok , " i " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
   , ( DecValTok , "0" )
-  , ( NormalTok , "; i < blocks." )
+  , ( OperatorTok , ";" )
+  , ( NormalTok , " i " )
+  , ( OperatorTok , "<" )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "length" )
-  , ( NormalTok , "; i++) {" )
+  , ( OperatorTok , ";" )
+  , ( NormalTok , " i" )
+  , ( OperatorTok , "++)" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "String" )
-  , ( NormalTok , " b = blocks[i];" )
+  , ( NormalTok , " b " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "i" )
+  , ( OperatorTok , "];" )
   ]
 , [ ( NormalTok , "                " )
-  , ( KeywordTok , "if" )
-  , ( NormalTok , "(" )
+  , ( ControlFlowTok , "if" )
+  , ( OperatorTok , "(" )
   , ( BuiltInTok , "Character" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "toUpperCase" )
-  , ( NormalTok , "(b." )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "b" )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "charAt" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "0" )
-  , ( NormalTok , ")) != c && " )
+  , ( OperatorTok , "))" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "!=" )
+  , ( NormalTok , " c " )
+  , ( OperatorTok , "&&" )
+  , ( NormalTok , " " )
   , ( BuiltInTok , "Character" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "toUpperCase" )
-  , ( NormalTok , "(b." )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "b" )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "charAt" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "1" )
-  , ( NormalTok , ")) != c)" )
+  , ( OperatorTok , "))" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "!=" )
+  , ( NormalTok , " c" )
+  , ( OperatorTok , ")" )
   ]
 , [ ( NormalTok , "                    " )
-  , ( KeywordTok , "continue" )
-  , ( NormalTok , ";" )
+  , ( ControlFlowTok , "continue" )
+  , ( OperatorTok , ";" )
   ]
 , [ ( NormalTok , "                " )
   , ( FunctionTok , "swap" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "0" )
-  , ( NormalTok , ", i, blocks);" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " i" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , ");" )
   ]
 , [ ( NormalTok , "                " )
-  , ( KeywordTok , "if" )
-  , ( NormalTok , "(" )
+  , ( ControlFlowTok , "if" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(word." )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "substring" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "1" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( BuiltInTok , "Arrays" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "copyOfRange" )
-  , ( NormalTok , "(blocks, " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "blocks" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( DecValTok , "1" )
-  , ( NormalTok , ", blocks." )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "length" )
-  , ( NormalTok , ")))" )
+  , ( OperatorTok , ")))" )
   ]
 , [ ( NormalTok , "                    " )
-  , ( KeywordTok , "return" )
+  , ( ControlFlowTok , "return" )
   , ( NormalTok , " " )
   , ( KeywordTok , "true" )
-  , ( NormalTok , ";" )
+  , ( OperatorTok , ";" )
   ]
 , [ ( NormalTok , "                " )
   , ( FunctionTok , "swap" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "0" )
-  , ( NormalTok , ", i, blocks);" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " i" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , ");" )
   ]
-, [ ( NormalTok , "            }" ) ]
+, [ ( NormalTok , "            " ) , ( OperatorTok , "}" ) ]
 , [ ( NormalTok , "         " ) ]
 , [ ( NormalTok , "            " )
-  , ( KeywordTok , "return" )
+  , ( ControlFlowTok , "return" )
   , ( NormalTok , " " )
   , ( KeywordTok , "false" )
-  , ( NormalTok , ";" )
+  , ( OperatorTok , ";" )
   ]
-, [ ( NormalTok , "        }" ) ]
+, [ ( NormalTok , "        " ) , ( OperatorTok , "}" ) ]
 , [ ( NormalTok , "        " ) ]
 , [ ( NormalTok , "        " )
   , ( KeywordTok , "public" )
@@ -166,176 +259,233 @@
   , ( DataTypeTok , "void" )
   , ( NormalTok , " " )
   , ( FunctionTok , "main" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( BuiltInTok , "String" )
-  , ( NormalTok , "[] args){" )
+  , ( OperatorTok , "[]" )
+  , ( NormalTok , " args" )
+  , ( OperatorTok , "){" )
   ]
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "String" )
-  , ( NormalTok , "[] blocks = {" )
+  , ( OperatorTok , "[]" )
+  , ( NormalTok , " blocks " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   , ( StringTok , "\"BO\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"XK\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"DQ\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"CP\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"NA\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   ]
 , [ ( NormalTok , "                                " )
   , ( StringTok , "\"GT\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"RE\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"TG\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"QD\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"FS\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   ]
 , [ ( NormalTok , "                                " )
   , ( StringTok , "\"JW\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"HU\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"VI\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"AN\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"OB\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   ]
 , [ ( NormalTok , "                                " )
   , ( StringTok , "\"ER\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"FS\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"LY\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"PC\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"ZM\"" )
-  , ( NormalTok , "};" )
+  , ( OperatorTok , "};" )
   ]
 , []
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "System" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "out" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "println" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"" )
   , ( SpecialCharTok , "\\\"\\\"" )
   , ( StringTok , ": \"" )
-  , ( NormalTok , " + " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "+" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"\"" )
-  , ( NormalTok , ", blocks));" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "));" )
   ]
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "System" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "out" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "println" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"A: \"" )
-  , ( NormalTok , " + " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "+" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"A\"" )
-  , ( NormalTok , ", blocks));" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "));" )
   ]
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "System" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "out" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "println" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"BARK: \"" )
-  , ( NormalTok , " + " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "+" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"BARK\"" )
-  , ( NormalTok , ", blocks));" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "));" )
   ]
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "System" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "out" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "println" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"book: \"" )
-  , ( NormalTok , " + " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "+" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"book\"" )
-  , ( NormalTok , ", blocks));" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "));" )
   ]
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "System" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "out" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "println" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"treat: \"" )
-  , ( NormalTok , " + " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "+" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"treat\"" )
-  , ( NormalTok , ", blocks));" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "));" )
   ]
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "System" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "out" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "println" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"COMMON: \"" )
-  , ( NormalTok , " + " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "+" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"COMMON\"" )
-  , ( NormalTok , ", blocks));" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "));" )
   ]
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "System" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "out" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "println" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"SQuAd: \"" )
-  , ( NormalTok , " + " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "+" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"SQuAd\"" )
-  , ( NormalTok , ", blocks));" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "));" )
   ]
 , [ ( NormalTok , "                " )
   , ( BuiltInTok , "System" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "out" )
-  , ( NormalTok , "." )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "println" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"CONFUSE: \"" )
-  , ( NormalTok , " + " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "+" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"CONFUSE\"" )
-  , ( NormalTok , ", blocks));" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "));" )
   ]
 , [ ( NormalTok , "                " ) ]
-, [ ( NormalTok , "        }" ) ]
-, [ ( NormalTok , "}" ) ]
+, [ ( NormalTok , "        " ) , ( OperatorTok , "}" ) ]
+, [ ( OperatorTok , "}" ) ]
 ]
diff --git a/test/expected/abc.kotlin.native b/test/expected/abc.kotlin.native
--- a/test/expected/abc.kotlin.native
+++ b/test/expected/abc.kotlin.native
@@ -1,6 +1,10 @@
 [ [ ( KeywordTok , "import" )
   , ( NormalTok , " " )
-  , ( ImportTok , "java.util.Arrays" )
+  , ( ImportTok , "java" )
+  , ( OperatorTok , "." )
+  , ( ImportTok , "util" )
+  , ( OperatorTok , "." )
+  , ( ImportTok , "Arrays" )
   ]
 , []
 , [ ( CommentTok , "/*" ) ]
@@ -8,54 +12,79 @@
   ]
 , [ ( CommentTok , " */" ) ]
 , [ ( KeywordTok , "fun" )
-  , ( NormalTok , " <" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "<" )
   , ( DataTypeTok , "T" )
-  , ( NormalTok , "> " )
+  , ( OperatorTok , ">" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Array" )
-  , ( NormalTok , "<" )
+  , ( OperatorTok , "<" )
   , ( DataTypeTok , "T" )
-  , ( NormalTok , ">." )
+  , ( OperatorTok , ">." )
   , ( FunctionTok , "swap" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( VariableTok , "i" )
-  , ( NormalTok , ": " )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " " )
   , ( DataTypeTok , "Int" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( VariableTok , "j" )
-  , ( NormalTok , ": " )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " " )
   , ( DataTypeTok , "Int" )
-  , ( NormalTok , ") {" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , [ ( NormalTok , "    " )
   , ( KeywordTok , "val" )
   , ( NormalTok , " " )
   , ( VariableTok , "tmp" )
-  , ( NormalTok , " = " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
   , ( KeywordTok , "this" )
-  , ( NormalTok , "[i]" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "i" )
+  , ( OperatorTok , "]" )
   ]
 , [ ( NormalTok , "    " )
   , ( KeywordTok , "this" )
-  , ( NormalTok , "[i] = " )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "i" )
+  , ( OperatorTok , "]" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
   , ( KeywordTok , "this" )
-  , ( NormalTok , "[j]" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "j" )
+  , ( OperatorTok , "]" )
   ]
 , [ ( NormalTok , "    " )
   , ( KeywordTok , "this" )
-  , ( NormalTok , "[j] = tmp" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "j" )
+  , ( OperatorTok , "]" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " tmp" )
   ]
-, [ ( NormalTok , "}" ) ]
+, [ ( OperatorTok , "}" ) ]
 , []
 , [ ( KeywordTok , "data" )
   , ( NormalTok , " " )
   , ( KeywordTok , "class" )
-  , ( NormalTok , " Block(" )
+  , ( NormalTok , " Block" )
+  , ( OperatorTok , "(" )
   , ( KeywordTok , "val" )
   , ( NormalTok , " " )
   , ( VariableTok , "block" )
-  , ( NormalTok , ": " )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " " )
   , ( DataTypeTok , "String" )
-  , ( NormalTok , ")" )
+  , ( OperatorTok , ")" )
   ]
 , []
 , [ ( NormalTok , "/*" ) ]
@@ -67,13 +96,17 @@
 , [ ( KeywordTok , "public" )
   , ( NormalTok , " " )
   , ( KeywordTok , "class" )
-  , ( NormalTok , " ABC() {" )
+  , ( NormalTok , " ABC" )
+  , ( OperatorTok , "()" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , [ ( NormalTok , "    " )
   , ( KeywordTok , "class" )
   , ( NormalTok , " " )
   , ( KeywordTok , "object" )
-  , ( NormalTok , " {" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , []
 , [ ( NormalTok , "        " )
@@ -82,25 +115,39 @@
   , ( KeywordTok , "fun" )
   , ( NormalTok , " " )
   , ( FunctionTok , "canMakeWord" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( VariableTok , "word" )
-  , ( NormalTok , ": " )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " " )
   , ( DataTypeTok , "String" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( VariableTok , "blocks" )
-  , ( NormalTok , ": " )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " " )
   , ( DataTypeTok , "Array" )
   , ( NormalTok , "<" )
   , ( VariableTok , "Block" )
-  , ( NormalTok , ">): " )
+  , ( NormalTok , ">" )
+  , ( OperatorTok , "):" )
+  , ( NormalTok , " " )
   , ( DataTypeTok , "Boolean" )
-  , ( NormalTok , " {" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , [ ( NormalTok , "            " )
   , ( ControlFlowTok , "if" )
-  , ( NormalTok , " (word.length() == " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "length" )
+  , ( OperatorTok , "()" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "==" )
+  , ( NormalTok , " " )
   , ( DecValTok , "0" )
-  , ( NormalTok , ")" )
+  , ( OperatorTok , ")" )
   ]
 , [ ( NormalTok , "                " )
   , ( KeywordTok , "return" )
@@ -112,68 +159,146 @@
   , ( KeywordTok , "val" )
   , ( NormalTok , " " )
   , ( VariableTok , "c" )
-  , ( NormalTok , " = Character.toUpperCase(word.charAt(" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " Character" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "toUpperCase" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "charAt" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "0" )
-  , ( NormalTok , "))" )
+  , ( OperatorTok , "))" )
   ]
 , [ ( NormalTok , "            " )
   , ( ControlFlowTok , "for" )
-  , ( NormalTok , " (i " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "i " )
   , ( KeywordTok , "in" )
   , ( NormalTok , " " )
-  , ( DecValTok , "0" )
-  , ( NormalTok , "..blocks.size - " )
+  , ( FloatTok , "0." )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "blocks" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "size " )
+  , ( OperatorTok , "-" )
+  , ( NormalTok , " " )
   , ( DecValTok , "1" )
-  , ( NormalTok , ") {" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , [ ( NormalTok , "                " )
   , ( KeywordTok , "val" )
   , ( NormalTok , " " )
   , ( VariableTok , "b" )
-  , ( NormalTok , " = blocks[i]" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "i" )
+  , ( OperatorTok , "]" )
   ]
 , [ ( NormalTok , "                " )
   , ( ControlFlowTok , "if" )
-  , ( NormalTok , " (Character.toUpperCase(b.block.charAt(" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "Character" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "toUpperCase" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "b" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "block" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "charAt" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "0" )
-  , ( NormalTok
-    , ")) != c && Character.toUpperCase(b.block.charAt("
-    )
+  , ( OperatorTok , "))" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "!=" )
+  , ( NormalTok , " c " )
+  , ( OperatorTok , "&&" )
+  , ( NormalTok , " Character" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "toUpperCase" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "b" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "block" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "charAt" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "1" )
-  , ( NormalTok , ")) != c)" )
+  , ( OperatorTok , "))" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "!=" )
+  , ( NormalTok , " c" )
+  , ( OperatorTok , ")" )
   ]
 , [ ( NormalTok , "                    " )
   , ( ControlFlowTok , "continue" )
   ]
-, [ ( NormalTok , "                blocks.swap(" )
+, [ ( NormalTok , "                blocks" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "swap" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "0" )
-  , ( NormalTok , ", i)" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " i" )
+  , ( OperatorTok , ")" )
   ]
 , [ ( NormalTok , "                " )
   , ( ControlFlowTok , "if" )
-  , ( NormalTok , " (canMakeWord(word.substring(" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "canMakeWord" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "substring" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "1" )
-  , ( NormalTok , "), Arrays.copyOfRange(blocks, " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " Arrays" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "copyOfRange" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "blocks" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( DecValTok , "1" )
-  , ( NormalTok , ", blocks.size)))" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "size" )
+  , ( OperatorTok , ")))" )
   ]
 , [ ( NormalTok , "                    " )
   , ( KeywordTok , "return" )
   , ( NormalTok , " " )
   , ( KeywordTok , "true" )
   ]
-, [ ( NormalTok , "                blocks.swap(" )
+, [ ( NormalTok , "                blocks" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "swap" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "0" )
-  , ( NormalTok , ", i)" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " i" )
+  , ( OperatorTok , ")" )
   ]
-, [ ( NormalTok , "            }" ) ]
+, [ ( NormalTok , "            " ) , ( OperatorTok , "}" ) ]
 , []
 , [ ( NormalTok , "            " )
   , ( KeywordTok , "return" )
   , ( NormalTok , " " )
   , ( KeywordTok , "false" )
   ]
-, [ ( NormalTok , "        }" ) ]
+, [ ( NormalTok , "        " ) , ( OperatorTok , "}" ) ]
 , []
 , [ ( NormalTok , "        " )
   , ( KeywordTok , "public" )
@@ -181,125 +306,206 @@
   , ( KeywordTok , "fun" )
   , ( NormalTok , " " )
   , ( FunctionTok , "main" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( VariableTok , "args" )
-  , ( NormalTok , ": " )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " " )
   , ( DataTypeTok , "Array" )
   , ( NormalTok , "<" )
   , ( VariableTok , "String" )
-  , ( NormalTok , ">) {" )
+  , ( NormalTok , ">" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , []
 , [ ( NormalTok , "            " )
   , ( KeywordTok , "val" )
   , ( NormalTok , " " )
   , ( VariableTok , "blocksString" )
-  , ( NormalTok , " = array(" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " array" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"BO\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"XK\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"DQ\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"CP\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"NA\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"GT\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"RE\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"TG\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"QD\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"FS\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"JW\"" )
-  , ( NormalTok , "," )
+  , ( OperatorTok , "," )
   ]
 , [ ( NormalTok , "                                             " )
   , ( StringTok , "\"HU\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"VI\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"AN\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"OB\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"ER\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"FS\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"LY\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"PC\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"ZM\"" )
-  , ( NormalTok , ");" )
+  , ( OperatorTok , ");" )
   ]
 , []
 , [ ( NormalTok , "            " )
   , ( KeywordTok , "val" )
   , ( NormalTok , " " )
   , ( VariableTok , "blocks" )
-  , ( NormalTok
-    , " = Array(blocksString.size, { s -> Block(blocksString[s])})"
-    )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " Array" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "blocksString" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "size" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
+  , ( NormalTok , " s " )
+  , ( OperatorTok , "->" )
+  , ( NormalTok , " Block" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "blocksString" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "s" )
+  , ( OperatorTok , "])})" )
   ]
 , []
 , [ ( NormalTok , "            " )
   , ( KeywordTok , "val" )
   , ( NormalTok , " " )
   , ( VariableTok , "words" )
-  , ( NormalTok , " = array(" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " array" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"A\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"BARK\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"book\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"treat\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"COMMON\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"SQuAd\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"CONFUSE\"" )
-  , ( NormalTok , ");" )
+  , ( OperatorTok , ");" )
   ]
 , []
 , [ ( NormalTok , "            " )
   , ( ControlFlowTok , "for" )
-  , ( NormalTok , " (word " )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word " )
   , ( KeywordTok , "in" )
-  , ( NormalTok , " words) {" )
+  , ( NormalTok , " words" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
-, [ ( NormalTok , "                System." )
+, [ ( NormalTok , "                System" )
+  , ( OperatorTok , "." )
   , ( KeywordTok , "out" )
-  , ( NormalTok , ".println(" )
-  , ( StringTok , "\"${word}: \"" )
-  , ( NormalTok , " + canMakeWord(" )
-  , ( StringTok , "\"${word}\"" )
-  , ( NormalTok , ", blocks))" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "println" )
+  , ( OperatorTok , "(" )
+  , ( StringTok , "\"" )
+  , ( SpecialStringTok , "${" )
+  , ( NormalTok , "word" )
+  , ( SpecialStringTok , "}" )
+  , ( StringTok , ": \"" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "+" )
+  , ( NormalTok , " canMakeWord" )
+  , ( OperatorTok , "(" )
+  , ( StringTok , "\"" )
+  , ( SpecialStringTok , "${" )
+  , ( NormalTok , "word" )
+  , ( SpecialStringTok , "}" )
+  , ( StringTok , "\"" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "))" )
   ]
-, [ ( NormalTok , "            }" ) ]
+, [ ( NormalTok , "            " ) , ( OperatorTok , "}" ) ]
 , []
-, [ ( NormalTok , "        }" ) ]
-, [ ( NormalTok , "    }" ) ]
-, [ ( NormalTok , "}" ) ]
+, [ ( NormalTok , "        " ) , ( OperatorTok , "}" ) ]
+, [ ( NormalTok , "    " ) , ( OperatorTok , "}" ) ]
+, [ ( OperatorTok , "}" ) ]
 , []
 , [ ( KeywordTok , "fun" )
   , ( NormalTok , " " )
   , ( FunctionTok , "main" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( VariableTok , "args" )
-  , ( NormalTok , ": " )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " " )
   , ( DataTypeTok , "Array" )
   , ( NormalTok , "<" )
   , ( VariableTok , "String" )
-  , ( NormalTok , ">) = ABC.main(args)" )
+  , ( NormalTok , ">" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " ABC" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "main" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "args" )
+  , ( OperatorTok , ")" )
   ]
 ]
diff --git a/test/expected/abc.scala.native b/test/expected/abc.scala.native
--- a/test/expected/abc.scala.native
+++ b/test/expected/abc.scala.native
@@ -1,7 +1,8 @@
 [ [ ( KeywordTok , "object" )
   , ( NormalTok , " AbcBlocks " )
   , ( KeywordTok , "extends" )
-  , ( NormalTok , " App {" )
+  , ( NormalTok , " App " )
+  , ( OperatorTok , "{" )
   ]
 , []
 , [ ( NormalTok , "  " )
@@ -10,16 +11,43 @@
   , ( KeywordTok , "class" )
   , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(face1: Char, face2: Char) {" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "face1" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " " )
+  , ( BuiltInTok , "Char" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " face2" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " " )
+  , ( BuiltInTok , "Char" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , []
 , [ ( NormalTok , "    " )
   , ( KeywordTok , "def" )
   , ( NormalTok , " " )
   , ( FunctionTok , "isFacedWith" )
-  , ( NormalTok
-    , "(that: Char) = { that == face1 || that == face2 }"
-    )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "that" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " " )
+  , ( BuiltInTok , "Char" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
+  , ( NormalTok , " that " )
+  , ( OperatorTok , "==" )
+  , ( NormalTok , " face1 " )
+  , ( OperatorTok , "||" )
+  , ( NormalTok , " that " )
+  , ( OperatorTok , "==" )
+  , ( NormalTok , " face2 " )
+  , ( OperatorTok , "}" )
   ]
 , [ ( NormalTok , "    " )
   , ( KeywordTok , "override" )
@@ -27,129 +55,172 @@
   , ( KeywordTok , "def" )
   , ( NormalTok , " " )
   , ( FunctionTok , "toString" )
-  , ( NormalTok , "() = face1." )
-  , ( FunctionTok , "toString" )
-  , ( NormalTok , " + face2" )
+  , ( OperatorTok , "()" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " face1" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "toString " )
+  , ( OperatorTok , "+" )
+  , ( NormalTok , " face2" )
   ]
-, [ ( NormalTok , "  }" ) ]
+, [ ( NormalTok , "  " ) , ( OperatorTok , "}" ) ]
 , [ ( NormalTok , "  " )
   , ( KeywordTok , "protected" )
   , ( NormalTok , " " )
   , ( KeywordTok , "object" )
-  , ( NormalTok , " Block {" )
+  , ( NormalTok , " Block " )
+  , ( OperatorTok , "{" )
   ]
 , [ ( NormalTok , "    " )
   , ( KeywordTok , "def" )
   , ( NormalTok , " " )
   , ( FunctionTok , "apply" )
-  , ( NormalTok , "(faces: String) = " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "faces" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " String" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
   , ( KeywordTok , "new" )
   , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(faces." )
-  , ( FunctionTok , "head" )
-  , ( NormalTok , ", faces." )
-  , ( FunctionTok , "last" )
-  , ( NormalTok , ")" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "faces" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "head" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " faces" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "last" )
+  , ( OperatorTok , ")" )
   ]
-, [ ( NormalTok , "  }" ) ]
+, [ ( NormalTok , "  " ) , ( OperatorTok , "}" ) ]
 , []
 , [ ( NormalTok , "  " )
   , ( KeywordTok , "type" )
-  , ( NormalTok , " word = Seq[Block]" )
+  , ( NormalTok , " word " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
+  , ( BuiltInTok , "Seq" )
+  , ( OperatorTok , "[" )
+  , ( NormalTok , "Block" )
+  , ( OperatorTok , "]" )
   ]
 , []
 , [ ( NormalTok , "  " )
   , ( KeywordTok , "private" )
   , ( NormalTok , " " )
   , ( KeywordTok , "val" )
-  , ( NormalTok , " blocks = List(" )
+  , ( NormalTok , " blocks " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
+  , ( BuiltInTok , "List" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"BO\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"XK\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"DQ\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"CP\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"NA\"" )
-  , ( NormalTok , ")," )
+  , ( OperatorTok , ")," )
   ]
 , [ ( NormalTok , "    " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"GT\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"RE\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"TG\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"QD\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"FS\"" )
-  , ( NormalTok , ")," )
+  , ( OperatorTok , ")," )
   ]
 , [ ( NormalTok , "    " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"JW\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"HU\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"VI\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"AN\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"OB\"" )
-  , ( NormalTok , ")," )
+  , ( OperatorTok , ")," )
   ]
 , [ ( NormalTok , "    " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"ER\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"FS\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"LY\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"PC\"" )
-  , ( NormalTok , "), " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " " )
   , ( FunctionTok , "Block" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"ZM\"" )
-  , ( NormalTok , "))" )
+  , ( OperatorTok , "))" )
   ]
 , []
 , [ ( NormalTok , "  " )
@@ -158,188 +229,316 @@
   , ( KeywordTok , "def" )
   , ( NormalTok , " " )
   , ( FunctionTok , "isMakeable" )
-  , ( NormalTok , "(word: String, blocks: word) = {" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " String" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " word" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , []
 , [ ( NormalTok , "    " )
   , ( KeywordTok , "def" )
   , ( NormalTok , " " )
   , ( FunctionTok , "getTheBlocks" )
-  , ( NormalTok , "(word: String, blocks: word) = {" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " String" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " word" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , []
 , [ ( NormalTok , "      " )
   , ( KeywordTok , "def" )
   , ( NormalTok , " " )
   , ( FunctionTok , "inner" )
-  , ( NormalTok
-    , "(word: String, toCompare: word, rest: word, accu: word): word = {"
-    )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " String" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " toCompare" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " word" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " rest" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " word" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " accu" )
+  , ( OperatorTok , ":" )
+  , ( NormalTok , " word" )
+  , ( OperatorTok , "):" )
+  , ( NormalTok , " word " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , [ ( NormalTok , "        " )
-  , ( KeywordTok , "if" )
-  , ( NormalTok , " (word." )
-  , ( FunctionTok , "isEmpty" )
-  , ( NormalTok , " || rest." )
-  , ( FunctionTok , "isEmpty" )
-  , ( NormalTok , " || toCompare." )
-  , ( FunctionTok , "isEmpty" )
-  , ( NormalTok , ") accu" )
+  , ( ControlFlowTok , "if" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "isEmpty " )
+  , ( OperatorTok , "||" )
+  , ( NormalTok , " rest" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "isEmpty " )
+  , ( OperatorTok , "||" )
+  , ( NormalTok , " toCompare" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "isEmpty" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " accu" )
   ]
 , [ ( NormalTok , "        " )
-  , ( KeywordTok , "else" )
+  , ( ControlFlowTok , "else" )
   , ( NormalTok , " " )
-  , ( KeywordTok , "if" )
-  , ( NormalTok , " (toCompare." )
-  , ( FunctionTok , "head" )
-  , ( NormalTok , "." )
+  , ( ControlFlowTok , "if" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "toCompare" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "head" )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "isFacedWith" )
-  , ( NormalTok , "(word." )
-  , ( FunctionTok , "head" )
-  , ( NormalTok , ")) {" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "head" )
+  , ( OperatorTok , "))" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "{" )
   ]
 , [ ( NormalTok , "          " )
   , ( KeywordTok , "val" )
-  , ( NormalTok , " restant = rest diff List(toCompare." )
-  , ( FunctionTok , "head" )
-  , ( NormalTok , ")" )
+  , ( NormalTok , " restant " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " rest diff " )
+  , ( BuiltInTok , "List" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "toCompare" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "head" )
+  , ( OperatorTok , ")" )
   ]
 , [ ( NormalTok , "          " )
   , ( FunctionTok , "inner" )
-  , ( NormalTok , "(word." )
-  , ( FunctionTok , "tail" )
-  , ( NormalTok , ", restant, restant, accu :+ toCompare." )
-  , ( FunctionTok , "head" )
-  , ( NormalTok , ")" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "tail" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " restant" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " restant" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " accu " )
+  , ( OperatorTok , ":+" )
+  , ( NormalTok , " toCompare" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "head" )
+  , ( OperatorTok , ")" )
   ]
-, [ ( NormalTok , "        } " )
-  , ( KeywordTok , "else" )
+, [ ( NormalTok , "        " )
+  , ( OperatorTok , "}" )
   , ( NormalTok , " " )
+  , ( ControlFlowTok , "else" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "inner" )
-  , ( NormalTok , "(word, toCompare." )
-  , ( FunctionTok , "tail" )
-  , ( NormalTok , ", rest, accu)" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " toCompare" )
+  , ( OperatorTok , "." )
+  , ( NormalTok , "tail" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " rest" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " accu" )
+  , ( OperatorTok , ")" )
   ]
-, [ ( NormalTok , "      }" ) ]
+, [ ( NormalTok , "      " ) , ( OperatorTok , "}" ) ]
 , [ ( NormalTok , "      " )
   , ( FunctionTok , "inner" )
-  , ( NormalTok , "(word, blocks, blocks, Nil)" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " Nil" )
+  , ( OperatorTok , ")" )
   ]
-, [ ( NormalTok , "    }" ) ]
+, [ ( NormalTok , "    " ) , ( OperatorTok , "}" ) ]
 , []
-, [ ( NormalTok , "    word." )
+, [ ( NormalTok , "    word" )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "lengthCompare" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "getTheBlocks" )
-  , ( NormalTok , "(word, blocks)." )
-  , ( FunctionTok , "size" )
-  , ( NormalTok , ") == " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "word" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , ")." )
+  , ( NormalTok , "size" )
+  , ( OperatorTok , ")" )
+  , ( NormalTok , " " )
+  , ( OperatorTok , "==" )
+  , ( NormalTok , " " )
   , ( DecValTok , "0" )
   ]
-, [ ( NormalTok , "  }" ) ]
+, [ ( NormalTok , "  " ) , ( OperatorTok , "}" ) ]
 , []
 , [ ( NormalTok , "  " )
   , ( KeywordTok , "val" )
-  , ( NormalTok , " words = List(" )
+  , ( NormalTok , " words " )
+  , ( OperatorTok , "=" )
+  , ( NormalTok , " " )
+  , ( BuiltInTok , "List" )
+  , ( OperatorTok , "(" )
   , ( StringTok , "\"A\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"BARK\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"BOOK\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"TREAT\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"COMMON\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"SQUAD\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"CONFUSED\"" )
-  , ( NormalTok , ", " )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " " )
   , ( StringTok , "\"ANBOCPDQERSFTGUVWXLZ\"" )
-  , ( NormalTok , ")" )
+  , ( OperatorTok , ")" )
   ]
 , [ ( NormalTok , "  " ) , ( CommentTok , "// Automatic tests" ) ]
 , [ ( NormalTok , "  " )
   , ( FunctionTok , "assert" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "isMakeable" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "words" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "0" )
-  , ( NormalTok , "), blocks))" )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "))" )
   ]
 , [ ( NormalTok , "  " )
   , ( FunctionTok , "assert" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "isMakeable" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "words" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "1" )
-  , ( NormalTok , "), blocks))" )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "))" )
   ]
 , [ ( NormalTok , "  " )
   , ( FunctionTok , "assert" )
-  , ( NormalTok , "(!" )
+  , ( OperatorTok , "(!" )
   , ( FunctionTok , "isMakeable" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "words" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "2" )
-  , ( NormalTok , "), blocks)) " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "))" )
+  , ( NormalTok , " " )
   , ( CommentTok , "// BOOK not" )
   ]
 , [ ( NormalTok , "  " )
   , ( FunctionTok , "assert" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "isMakeable" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "words" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "3" )
-  , ( NormalTok , "), blocks))" )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "))" )
   ]
 , [ ( NormalTok , "  " )
   , ( FunctionTok , "assert" )
-  , ( NormalTok , "(!" )
+  , ( OperatorTok , "(!" )
   , ( FunctionTok , "isMakeable" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "words" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "4" )
-  , ( NormalTok , "), blocks)) " )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "))" )
+  , ( NormalTok , " " )
   , ( CommentTok , "// COMMON not" )
   ]
 , [ ( NormalTok , "  " )
   , ( FunctionTok , "assert" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "isMakeable" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "words" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "5" )
-  , ( NormalTok , "), blocks))" )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "))" )
   ]
 , [ ( NormalTok , "  " )
   , ( FunctionTok , "assert" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "isMakeable" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "words" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "6" )
-  , ( NormalTok , "), blocks))" )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "))" )
   ]
 , [ ( NormalTok , "  " )
   , ( FunctionTok , "assert" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "isMakeable" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( FunctionTok , "words" )
-  , ( NormalTok , "(" )
+  , ( OperatorTok , "(" )
   , ( DecValTok , "7" )
-  , ( NormalTok , "), blocks))" )
+  , ( OperatorTok , ")," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "))" )
   ]
 , []
 , [ ( NormalTok , "  " )
@@ -348,17 +547,37 @@
     )
   ]
 , []
-, [ ( NormalTok , "  words." )
+, [ ( NormalTok , "  words" )
+  , ( OperatorTok , "." )
   , ( FunctionTok , "foreach" )
-  , ( NormalTok , "(w => " )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "w " )
+  , ( OperatorTok , "=>" )
+  , ( NormalTok , " " )
   , ( FunctionTok , "println" )
-  , ( NormalTok , "(s" )
-  , ( StringTok , "\"$w can${if (isMakeable(w, blocks)) \"" )
+  , ( OperatorTok , "(" )
+  , ( SpecialStringTok , "s\"$w" )
+  , ( StringTok , " can" )
+  , ( SpecialStringTok , "${" )
+  , ( ControlFlowTok , "if" )
   , ( NormalTok , " " )
-  , ( StringTok , "\" else \"" )
-  , ( NormalTok , "not " )
-  , ( StringTok , "\"}be made.\"" )
-  , ( NormalTok , "))" )
+  , ( OperatorTok , "(" )
+  , ( FunctionTok , "isMakeable" )
+  , ( OperatorTok , "(" )
+  , ( NormalTok , "w" )
+  , ( OperatorTok , "," )
+  , ( NormalTok , " blocks" )
+  , ( OperatorTok , "))" )
+  , ( NormalTok , " " )
+  , ( StringTok , "\" \"" )
+  , ( NormalTok , " " )
+  , ( ControlFlowTok , "else" )
+  , ( NormalTok , " " )
+  , ( StringTok , "\"not \"" )
+  , ( SpecialStringTok , "}" )
+  , ( StringTok , "be made." )
+  , ( SpecialStringTok , "\"" )
+  , ( OperatorTok , "))" )
   ]
-, [ ( NormalTok , "}" ) ]
+, [ ( OperatorTok , "}" ) ]
 ]
diff --git a/xml/abc.xml b/xml/abc.xml
--- a/xml/abc.xml
+++ b/xml/abc.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Andrea Primiani - primiani at dag dot it
  	version1.10 - 12 december 2005 -->
-<language name="ABC" version="7" kateversion="2.4" section="Other" extensions="*.abc;*.ABC" mimetype="text/vnd.abc" casesensitive="1" author="Andrea Primiani (primiani@dag.it)" license="LGPL">
+<language name="ABC" version="7" kateversion="5.0" section="Other" extensions="*.abc;*.ABC" mimetype="text/vnd.abc" casesensitive="1" author="Andrea Primiani (primiani@dag.it)" license="LGPL">
     <highlighting>
         <contexts>
            <context name="Normal" attribute="Normal Text" lineEndContext="#stay">
diff --git a/xml/actionscript.xml b/xml/actionscript.xml
--- a/xml/actionscript.xml
+++ b/xml/actionscript.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="ActionScript 2.0" version="7" kateversion="5.0" section="Sources" extensions="*.as" mimetype="text/x-actionscript" license="LGPL" author="Aaron Miller (armantic101@gmail.com)">
+<language name="ActionScript 2.0" version="8" kateversion="5.62" section="Sources" extensions="*.as" mimetype="text/x-actionscript" license="LGPL" author="Aaron Miller (armantic101@gmail.com)">
   <highlighting>
     
     <list name="properties">
@@ -226,7 +226,6 @@
     <list name="const">
       <item>false</item>
       <item>Infinity</item>
-      <item>-Infinity</item>
       <item>NaN</item>
       <item>newline</item>
       <item>null</item>
@@ -255,10 +254,10 @@
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Constants" context="#stay" String="const"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
-        <Float attribute="Float" context="Float Suffixes"/>
+        <Float attribute="Float" context="#stay"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="Int Suffixes"/>
+        <Int attribute="Decimal" context="#stay"/>
         <HlCChar attribute="Char" context="#stay"/>
         <RegExpr attribute="Decimal" context="#stay" String="//\s*BEGIN.*$" beginRegion="Region1"/>
         <RegExpr attribute="Decimal" context="#stay" String="//\s*END.*$" endRegion="Region1"/>
@@ -268,7 +267,7 @@
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1"/>
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"/>
         <RegExpr attribute="Keyword" context="#stay" String="\.{3,3}\s+" />  
-        <RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*(/\*\s*\d+\s*\*/\s*)?[(])" />
+        <RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*(?:/\*\s*\d+\s*\*/\s*)?[(])" />
         <DetectChar attribute="Symbol" context="Member" char="." />
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/*&lt;=&gt;?[]|~^&#59;"/>
       </context>
@@ -276,25 +275,12 @@
         <RegExpr attribute="Keyword" context="#pop!StaticImports" String="import\s+static\b" />
         <WordDetect attribute="Keyword" context="#pop!Imports" String="import" />
       </context>
-      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-          <AnyChar String="fF" attribute="Float" context="#pop"/>
-      </context>
-      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
-      </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
         <HlCStringChar attribute="String Char" context="#stay"/>
         <DetectChar attribute="String" context="#pop" char="&quot;"/>
       </context>
-      <context attribute="Normal Text" lineEndContext="#pop" name="Member" fallthrough="true" fallthroughContext="#pop">  
+      <context attribute="Normal Text" lineEndContext="#pop" name="Member" fallthroughContext="#pop">  
         <RegExpr attribute="Function" context="#pop" String="\b[_a-zA-Z]\w*(?=[\s]*)" />
       </context>
       <context attribute="StaticImports" lineEndContext="#pop" name="StaticImports"/>
diff --git a/xml/asn1.xml b/xml/asn1.xml
--- a/xml/asn1.xml
+++ b/xml/asn1.xml
@@ -13,7 +13,7 @@
 
         You'll find the "Writing a Kate Highlighting XML File HOWTO" at http://kate.kde.org/doc/hlhowto.php
 -->
-<language name="ASN.1" section="Markup" version="5" kateversion="2.3" extensions="*.asn;*.asn1" mimetype="" author="Philippe Rigault" license="GPL">
+<language name="ASN.1" section="Markup" version="5" kateversion="5.0" extensions="*.asn;*.asn1" mimetype="" author="Philippe Rigault" license="GPL">
   <highlighting>
     <list name="keywords">
       <item>DEFINITIONS</item>
diff --git a/xml/ats.xml b/xml/ats.xml
--- a/xml/ats.xml
+++ b/xml/ats.xml
@@ -7,7 +7,7 @@
 <!ENTITY ESC    "(\\[ntbr'&quot;\\]|\\[0-9]{3}|\\x[0-9A-Fa-f]{2})"> <!-- ATS character code escapes. -->
 <!ENTITY DEC    "[0-9][0-9_]*">                                     <!-- Decimal digits with underscores. -->
 ]>
-<language name="ATS" version="3" kateversion="2.4" section="Sources" extensions="*.dats;*.sats;*.hats" mimetype="" author="Kiwamu Okabe (kiwamu@debian.or.jp)" license="LGPL">
+<language name="ATS" version="3" kateversion="5.0" section="Sources" extensions="*.dats;*.sats;*.hats" mimetype="" author="Kiwamu Okabe (kiwamu@debian.or.jp)" license="LGPL">
   <highlighting>
     <list name="keywords">
       <item>abstype</item>
diff --git a/xml/bash.xml b/xml/bash.xml
--- a/xml/bash.xml
+++ b/xml/bash.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE language SYSTEM "language.dtd"
 [
         <!ENTITY tab      "&#009;">
-        <!ENTITY funcname "[A-Za-z_:][A-Za-z0-9_:#&#37;@-]*">
+        <!ENTITY funcname "([^&_fragpathseps;{}=#$]|[+!@](?!\())([^&_fragpathseps;{}=$]*+([+!@](?!\())?+)*+">
         <!ENTITY varname  "[A-Za-z_][A-Za-z0-9_]*">
         <!ENTITY eos      "(?=$|[ &tab;])">                 <!-- eol or space following -->
         <!ENTITY eoexpr   "(?=$|[ &tab;&lt;>|&amp;;])">
@@ -28,7 +28,7 @@
         <!ENTITY heredocq "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&wordseps;&substseps;]*))">
 ]>
 
-<language name="Bash" version="15" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="17" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
@@ -471,8 +471,8 @@
         <Detect2Chars attribute="Redirection" context="FdRedirection" char="&amp;" char1=">"/>
 
         <!-- handle branche conditions -->
-        <Detect2Chars attribute="Control" context="#pop" char="&amp;" char1="&amp;"/>
-        <Detect2Chars attribute="Control" context="#pop" char="|" char1="|"/>
+        <Detect2Chars attribute="Control" context="#stay" char="&amp;" char1="&amp;"/>
+        <Detect2Chars attribute="Control" context="#stay" char="|" char1="|"/>
 
         <!-- handle &, |, ; -->
         <AnyChar attribute="Control" context="#stay" String="&amp;|;"/>
@@ -495,7 +495,7 @@
       </context>
       <context attribute="Normal Text" lineEndContext="#pop" name="MaybeBracketExpression" fallthroughContext="#pop!Command">
         <!-- start expression in double brackets -->
-        <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression"/>
+        <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[(?=$|[ &tab;(])" beginRegion="expression"/>
         <!-- start expression in single brackets -->
         <RegExpr attribute="Builtin" context="ExprBracket" String="\[&eos;" beginRegion="expression"/>
       </context>
@@ -642,6 +642,9 @@
         <IncludeRules context="FindWord"/>
         <DetectChar context="NormalMaybeBraceExpansion" char="{" lookAhead="1"/>
         <IncludeRules context="FindPathThenPop"/>
+        <IncludeRules context="FindNormalTextOption"/>
+      </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindNormalTextOption">
         <RegExpr attribute="Normal Text" context="#stay" String="[^&wordseps;&substseps;]+"/>
       </context>
       <context attribute="Normal Text" lineEndContext="#pop" name="OptionMaybeBraceExpansion">
@@ -1146,33 +1149,40 @@
 
       <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketNot" fallthroughContext="#pop!ExprBracketParam1">
         <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketParam1"/>
-        <DetectChar context="ExprBracketTestMaybeNot" char="!" lookAhead="1"/>
+        <Detect2Chars attribute="Expression" context="ExprBracketTestMaybeNot" char="!" char1=" " lookAhead="1"/>
+        <Detect2Chars attribute="Expression" context="ExprBracketTestMaybeNot" char="!" char1="&tab;" lookAhead="1"/>
       </context>
-      <context attribute="Normal Text" lineEndContext="#pop" name="ExprBracketTestMaybeNot" fallthroughContext="#pop#pop!ExprBracketParam1">
-        <RegExpr attribute="Expression" context="#pop" String="!(?=[ &tab;])"/>
+      <context attribute="Normal Text" lineEndContext="#pop" name="ExprBracketTestMaybeNot">
+        <DetectChar attribute="Expression" context="#pop" char="!"/>
       </context>
 
-      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam1" fallthroughContext="NormalOption">
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam1" fallthroughContext="ExprBracketValue">
         <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketParam2"/>
         <DetectChar context="TestMaybeUnary" char="-" lookAhead="1"/>
         <IncludeRules context="FindExprBracketEnd"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#pop" name="ExprBracketValue">
         <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
+        <AnyChar context="#pop" String=" &tab;" lookAhead="1"/>
+        <IncludeRules context="FindWord"/>
+        <DetectChar context="NormalMaybeBraceExpansion" char="{" lookAhead="1"/>
+        <IncludeRules context="FindPathThenPop"/>
+        <IncludeRules context="FindNormalTextOption"/>
       </context>
 
-      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam2" fallthroughContext="NormalOption">
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam2" fallthroughContext="ExprBracketValue">
         <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketParam3"/>
         <AnyChar context="TestMaybeBinary" String="-=!" lookAhead="1"/>
         <IncludeRules context="FindExprBracketEnd"/>
-        <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
       </context>
 
-      <context attribute="Normal Text" lineEndContext="ExprBracketFinal" name="ExprBracketParam3" fallthroughContext="NormalOption">
+      <context attribute="Normal Text" lineEndContext="ExprBracketFinal" name="ExprBracketParam3" fallthroughContext="ExprBracketValue">
         <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketFinal"/>
         <IncludeRules context="FindExprBracketEnd"/>
-        <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
       </context>
 
-      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketFinal" fallthroughContext="NormalOption">
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketFinal" fallthroughContext="ExprBracketValue">
         <DetectSpaces attribute="Normal Text" context="#stay"/>
         <IncludeRules context="FindExprBracketEnd"/>
         <RegExpr attribute="Error" context="#pop" String="(?:[^] &tab;]++|\][^ &tab;])++" endRegion="expression"/>
@@ -1183,10 +1193,10 @@
         <RegExpr attribute="Builtin" context="#pop" String="\](?=($|[ &tab;;|&amp;&lt;>]))" endRegion="expression"/>
       </context>
 
-      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeUnary" fallthroughContext="#pop!NormalOption">
+      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeUnary" fallthroughContext="#pop!ExprBracketValue">
         <RegExpr attribute="Expression" context="#pop" String="-[abcdefghkprstuwxGLNOSovRnz](?=[ &tab;])"/>
       </context>
-      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary" fallthroughContext="#pop!NormalOption">
+      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary" fallthroughContext="#pop!ExprBracketValue">
         <RegExpr attribute="Expression" context="#pop" String="(?:-(?:e[fq]|[nolg]t|[nlg]e)|==?|!=)(?=[ &tab;])"/>
       </context>
 
@@ -1202,40 +1212,56 @@
         <DetectChar context="ExprDblBracketTestMaybeNot" char="!" lookAhead="1"/>
       </context>
       <context attribute="Normal Text" lineEndContext="#pop" name="ExprDblBracketTestMaybeNot" fallthroughContext="#pop#pop!ExprDblBracketParam1">
-        <IncludeRules context="ExprBracketTestMaybeNot"/>
+        <RegExpr attribute="Expression" context="#pop" String="!(?=$|[ &tab;(])"/>
       </context>
 
-      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam1" fallthroughContext="NormalOption">
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam1" fallthroughContext="ExprDblBracketValue">
         <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketParam2"/>
         <DetectChar context="TestMaybeUnary" char="-" lookAhead="1"/>
         <AnyChar attribute="Expression" context="#pop!ExprDblBracketParam3Spe" String="&lt;>"/>
         <IncludeRules context="FindExprDblBracketEnd"/>
-        <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
       </context>
 
-      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam2" fallthroughContext="NormalOption">
+      <context attribute="Normal Text" lineEndContext="#pop" name="ExprDblBracketValue">
+        <Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression"/>
+        <DetectChar context="ExprDblBracketSubValue" char="(" lookAhead="1"/>
+        <DetectChar attribute="Operator" context="#pop#pop" char=")"/>
+        <Detect2Chars attribute="Control" context="#pop#pop!ExprDblBracket" char="&amp;" char1="&amp;"/>
+        <Detect2Chars attribute="Control" context="#pop#pop!ExprDblBracket" char="|" char1="|"/>
+        <AnyChar attribute="Error" context="#stay" String="|&amp;;)"/>
+        <AnyChar context="#pop" String=" &tab;&lt;>" lookAhead="1"/>
+        <IncludeRules context="FindWord"/>
+        <DetectChar context="NormalMaybeBraceExpansion" char="{" lookAhead="1"/>
+        <IncludeRules context="FindPathThenPop"/>
+        <IncludeRules context="FindNormalTextOption"/>
+      </context>
+      <context attribute="Normal Text" lineEndContext="#pop" name="ExprDblBracketSubValue" fallthroughContext="#pop">
+        <DetectChar attribute="Operator" context="ExprDblBracketNot" char="("/>
+        <Detect2Chars context="#pop#pop" char="]" char1="]" lookAhead="1"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam2" fallthroughContext="ExprDblBracketValue">
         <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketParam3"/>
         <AnyChar context="TestMaybeBinary2" String="-=!" lookAhead="1"/>
         <AnyChar attribute="Expression" context="#pop!ExprDblBracketParam3Spe" String="&lt;>"/>
         <IncludeRules context="FindExprDblBracketEnd"/>
-        <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
       </context>
-      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary2" fallthroughContext="#pop!NormalOption">
+      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary2" fallthroughContext="#pop!ExprDblBracketValue">
         <IncludeRules context="TestMaybeBinary"/>
-        <RegExpr attribute="Expression" context="#pop#pop!ExprDblBracketRegex" String="=~(?=[ &tab;])"/>
+        <RegExpr attribute="Expression" context="#pop#pop!ExprDblBracketRegex" String="=~(?=[ &tab;(])"/>
       </context>
 
       <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam3Spe" fallthroughContext="#pop!ExprDblBracketParam3">
         <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketParam3"/>
       </context>
 
-      <context attribute="Normal Text" lineEndContext="ExprDblBracketFinal" name="ExprDblBracketParam3" fallthroughContext="NormalOption">
+      <context attribute="Normal Text" lineEndContext="ExprDblBracketFinal" name="ExprDblBracketParam3" fallthroughContext="ExprDblBracketValue">
         <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketFinal"/>
         <IncludeRules context="FindExprDblBracketEnd"/>
-        <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
+        <AnyChar attribute="Error" context="#stay" String="&lt;>"/>
       </context>
 
-      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketFinal" fallthroughContext="NormalOption">
+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketFinal" fallthroughContext="ExprDblBracketValue">
         <DetectSpaces attribute="Normal Text" context="#stay"/>
         <IncludeRules context="FindExprDblBracketEnd"/>
         <RegExpr attribute="Error" context="#pop" String="(?:[^] &tab;]++|\](?:[^]]|\][^ &tab;]))++" endRegion="expression"/>
@@ -1243,6 +1269,8 @@
 
       <context attribute="Normal Text" lineEndContext="#stay" name="FindExprDblBracketEnd">
         <LineContinue attribute="Escape" context="#stay"/>
+        <Detect2Chars attribute="Control" context="#pop!ExprDblBracket" char="&amp;" char1="&amp;"/>
+        <Detect2Chars attribute="Control" context="#pop!ExprDblBracket" char="|" char1="|"/>
         <RegExpr attribute="Keyword" context="#pop" String="\]\](?=($|[ &tab;;|&amp;]))" endRegion="expression"/>
       </context>
 
diff --git a/xml/boo.xml b/xml/boo.xml
--- a/xml/boo.xml
+++ b/xml/boo.xml
@@ -156,10 +156,10 @@
 				<keyword attribute="Data Type" String="primitive" context="#stay" />
 				<RegExpr attribute="Normal Text" String="[a-zA-Z_][a-zA-Z_0-9]+" context="#stay"/>
 
-				<RegExpr attribute="Complex" String=" ((([0-9]*\.[0-9]+|[0-9]+\.)|([0-9]+|([0-9]*\.[0-9]+|[0-9]+\.))[eE](\+|-)?[0-9]+)|[0-9]+)[jJ]" context="#stay"/>
-				<RegExpr attribute="Float" String="([0-9]+\.[0-9]*|\.[0-9]+)([eE][0-9]+)?" context="#stay"/>
-				<RegExpr attribute="Int" String="([1-9][0-9]*([eE][0-9]+)?|0)" context="#stay"/>
-				<RegExpr attribute="Long" String="[1-9][0-9]*([eE][0-9.]+)?[Ll]" context="#stay"/>
+				<RegExpr attribute="Complex" String=" ((?:[0-9]*\.[0-9]+|[0-9]+\.|(?:[0-9]+|[0-9]*\.[0-9]+|[0-9]+\.)[eE][+-]?[0-9]+)|[0-9]+)[jJ]" context="#stay"/>
+				<RegExpr attribute="Float" String="(?:[0-9]+\.[0-9]*|\.[0-9]+)(?:[eE][0-9]+)?" context="#stay"/>
+				<RegExpr attribute="Int" String="(?:[1-9][0-9]*(?:[eE][0-9]+)?|0)" context="#stay"/>
+				<RegExpr attribute="Long" String="[1-9][0-9]*(?:[eE][0-9.]+)?[Ll]" context="#stay"/>
 				<RegExpr attribute="Hex" String="0[Xx][0-9a-fA-F]+" context="#stay"/>
 				<RegExpr attribute="Octal" String="0[1-9][0-9]*" context="#stay"/>
 
@@ -172,8 +172,8 @@
 				<Detect2Chars attribute="Raw String" char="R" char1="&quot;" context="Raw Q-string"/>
 
 				<DetectChar attribute="Comment" char="#" context="Comment"/>
-				<RegExpr attribute="Comment" String="^\s*u?'''" context="Tripple A-comment" beginRegion="Tripple A-region"/>
-				<RegExpr attribute="Comment" String="^\s*u?&quot;&quot;&quot;" context="Tripple Q-comment" beginRegion="Tripple Q-region"/>
+				<RegExpr attribute="Comment" String="^\s*u?'''" context="Tripple A-comment" beginRegion="Tripple A-region" column="0"/>
+				<RegExpr attribute="Comment" String="^\s*u?&quot;&quot;&quot;" context="Tripple Q-comment" beginRegion="Tripple Q-region" column="0"/>
 				<Detect2Chars attribute="Comment" char="/" char1="/" context="Comment SlashSlash"/>
 
 				<StringDetect attribute="String" String="'''" context="Tripple A-string" beginRegion="Tripple A-region"/>
diff --git a/xml/coffee.xml b/xml/coffee.xml
--- a/xml/coffee.xml
+++ b/xml/coffee.xml
@@ -3,7 +3,7 @@
 
 <language name="CoffeeScript"
           version="15"
-          kateversion="5.0"
+          kateversion="5.53"
           section="Scripts"
           extensions="Cakefile;*.coffee;*.coco;*.cson"
           mimetype="text/x-coffeescript;application/x-coffeescript;application/vnd.coffeescript"
diff --git a/xml/comments.xml b/xml/comments.xml
--- a/xml/comments.xml
+++ b/xml/comments.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 <language
     version="1"
-    kateversion="3.1"
+    kateversion="5.0"
     name="Comments"
     section="Other"
     extensions=""
diff --git a/xml/cpp.xml b/xml/cpp.xml
--- a/xml/cpp.xml
+++ b/xml/cpp.xml
@@ -11,7 +11,7 @@
 <language
     name="C++"
     section="Sources"
-    version="8"
+    version="9"
     kateversion="5.0"
     indenter="cstyle"
     style="C++"
@@ -640,19 +640,33 @@
     <item>QAbstract3DGraph</item>
     <item>QAbstract3DInputHandler</item>
     <item>QAbstract3DSeries</item>
+    <item>QAbstractActionInput</item>
     <item>QAbstractAnimation</item>
+    <item>QAbstractAnimation</item>
+    <item>QAbstractAnimationClip</item>
+    <item>QAbstractAspect</item>
+    <item>QAbstractAudioDeviceInfo</item>
+    <item>QAbstractAudioInput</item>
+    <item>QAbstractAudioOutput</item>
     <item>QAbstractAxis</item>
+    <item>QAbstractAxisInput</item>
     <item>QAbstractBarSeries</item>
     <item>QAbstractButton</item>
+    <item>QAbstractCameraController</item>
+    <item>QAbstractClipAnimator</item>
+    <item>QAbstractClipBlendNode</item>
     <item>QAbstractDataProxy</item>
     <item>QAbstractEventDispatcher</item>
     <item>QAbstractExtensionFactory</item>
     <item>QAbstractExtensionManager</item>
     <item>QAbstractFormBuilder</item>
+    <item>QAbstractFunctor</item>
     <item>QAbstractGraphicsShapeItem</item>
     <item>QAbstractItemDelegate</item>
     <item>QAbstractItemModel</item>
+    <item>QAbstractItemModelTester</item>
     <item>QAbstractItemView</item>
+    <item>QAbstractLight</item>
     <item>QAbstractListModel</item>
     <item>QAbstractMessageHandler</item>
     <item>QAbstractNativeEventFilter</item>
@@ -661,17 +675,23 @@
     <item>QAbstractOAuth2</item>
     <item>QAbstractOAuthReplyHandler</item>
     <item>QAbstractOpenGLFunctions</item>
+    <item>QAbstractPhysicalDevice</item>
+    <item>QAbstractPhysicalDeviceProxy</item>
     <item>QAbstractPlanarVideoBuffer</item>
     <item>QAbstractPrintDialog</item>
     <item>QAbstractProxyModel</item>
+    <item>QAbstractRayCaster</item>
     <item>QAbstractScrollArea</item>
     <item>QAbstractSeries</item>
+    <item>QAbstractSkeleton</item>
     <item>QAbstractSlider</item>
     <item>QAbstractSocket</item>
     <item>QAbstractSpinBox</item>
     <item>QAbstractState</item>
     <item>QAbstractTableModel</item>
     <item>QAbstractTextDocumentLayout</item>
+    <item>QAbstractTexture</item>
+    <item>QAbstractTextureImage</item>
     <item>QAbstractTransition</item>
     <item>QAbstractUriResolver</item>
     <item>QAbstractVideoBuffer</item>
@@ -703,8 +723,13 @@
     <item>QAccessibleValueInterface</item>
     <item>QAccessibleWidget</item>
     <item>QAction</item>
+    <item>QAction</item>
     <item>QActionEvent</item>
     <item>QActionGroup</item>
+    <item>QActionInput</item>
+    <item>QAdditiveClipBlend</item>
+    <item>QAlphaCoverage</item>
+    <item>QAlphaTest</item>
     <item>QAltimeter</item>
     <item>QAltimeterFilter</item>
     <item>QAltimeterReading</item>
@@ -714,17 +739,35 @@
     <item>QAmbientTemperatureFilter</item>
     <item>QAmbientTemperatureReading</item>
     <item>QAmbientTemperatureSensor</item>
+    <item>QAnalogAxisInput</item>
     <item>QAndroidActivityResultReceiver</item>
+    <item>QAndroidBinder</item>
+    <item>QAndroidIntent</item>
     <item>QAndroidJniEnvironment</item>
+    <item>QAndroidJniExceptionCleaner</item>
     <item>QAndroidJniObject</item>
+    <item>QAndroidParcel</item>
+    <item>QAndroidService</item>
+    <item>QAndroidServiceConnection</item>
+    <item>QAnimationAspect</item>
+    <item>QAnimationCallback</item>
+    <item>QAnimationClip</item>
+    <item>QAnimationClipData</item>
+    <item>QAnimationClipLoader</item>
+    <item>QAnimationController</item>
     <item>QAnimationGroup</item>
+    <item>QAnimationGroup</item>
     <item>QApplication</item>
     <item>QAreaLegendMarker</item>
     <item>QAreaSeries</item>
+    <item>QArmature</item>
+    <item>QAspectEngine</item>
+    <item>QAspectJob</item>
     <item>QAssociativeIterable</item>
     <item>QAtomicInt</item>
     <item>QAtomicInteger</item>
     <item>QAtomicPointer</item>
+    <item>QAttribute</item>
     <item>QAudioBuffer</item>
     <item>QAudioDecoder</item>
     <item>QAudioDecoderControl</item>
@@ -739,17 +782,23 @@
     <item>QAudioProbe</item>
     <item>QAudioRecorder</item>
     <item>QAudioRoleControl</item>
+    <item>QAudioSystemPlugin</item>
     <item>QAuthenticator</item>
     <item>QAxAggregated</item>
     <item>QAxBase</item>
     <item>QAxBindable</item>
     <item>QAxFactory</item>
+    <item>QAxis</item>
+    <item>QAxisAccumulator</item>
+    <item>QAxisSetting</item>
     <item>QAxObject</item>
     <item>QAxScript</item>
     <item>QAxScriptEngine</item>
     <item>QAxScriptManager</item>
     <item>QAxSelect</item>
     <item>QAxWidget</item>
+    <item>QBackendNode</item>
+    <item>QBackendNodeMapper</item>
     <item>QBackingStore</item>
     <item>QBar3DSeries</item>
     <item>QBarCategoryAxis</item>
@@ -759,8 +808,13 @@
     <item>QBarSeries</item>
     <item>QBarSet</item>
     <item>QBasicTimer</item>
+    <item>QBEInteger</item>
     <item>QBitArray</item>
     <item>QBitmap</item>
+    <item>QBlendedClipAnimator</item>
+    <item>QBlendEquation</item>
+    <item>QBlendEquationArguments</item>
+    <item>QBlitFramebuffer</item>
     <item>QBluetoothAddress</item>
     <item>QBluetoothDeviceDiscoveryAgent</item>
     <item>QBluetoothDeviceInfo</item>
@@ -780,13 +834,20 @@
     <item>QBoxSet</item>
     <item>QBrush</item>
     <item>QBuffer</item>
+    <item>QBuffer</item>
+    <item>QBufferCapture</item>
+    <item>QBufferDataGenerator</item>
+    <item>QButtonAxisInput</item>
     <item>QButtonGroup</item>
     <item>QByteArray</item>
     <item>QByteArrayList</item>
     <item>QByteArrayMatcher</item>
     <item>QCache</item>
+    <item>QCalendar</item>
     <item>QCalendarWidget</item>
+    <item>QCallbackMapping</item>
     <item>QCamera</item>
+    <item>QCamera</item>
     <item>QCameraCaptureBufferFormatControl</item>
     <item>QCameraCaptureDestinationControl</item>
     <item>QCameraControl</item>
@@ -803,15 +864,18 @@
     <item>QCameraImageProcessingControl</item>
     <item>QCameraInfo</item>
     <item>QCameraInfoControl</item>
+    <item>QCameraLens</item>
     <item>QCameraLocksControl</item>
-    <item>QCameraViewfinder</item>
+    <item>QCameraSelector</item>
     <item>QCameraViewfinderSettings</item>
     <item>QCameraViewfinderSettingsControl</item>
     <item>QCameraViewfinderSettingsControl2</item>
     <item>QCameraZoomControl</item>
     <item>QCanBus</item>
     <item>QCanBusDevice</item>
+    <item>QCanBusDeviceInfo</item>
     <item>QCanBusFactory</item>
+    <item>QCanBusFactoryV2</item>
     <item>QCanBusFrame</item>
     <item>QCandlestickLegendMarker</item>
     <item>QCandlestickModelMapper</item>
@@ -819,12 +883,28 @@
     <item>QCandlestickSet</item>
     <item>QCategory3DAxis</item>
     <item>QCategoryAxis</item>
+    <item>QCborArray</item>
+    <item>QCborError</item>
+    <item>QCborMap</item>
+    <item>QCborParserError</item>
+    <item>QCborStreamReader</item>
+    <item>QCborStreamWriter</item>
+    <item>QCborValue</item>
+    <item>QChannel</item>
+    <item>QChannelMapper</item>
+    <item>QChannelMapping</item>
+    <item>QChannelMappingCreatedChangeBase</item>
     <item>QChar</item>
     <item>QChart</item>
     <item>QChartView</item>
     <item>QCheckBox</item>
     <item>QChildEvent</item>
+    <item>QClearBuffers</item>
+    <item>QClipAnimator</item>
+    <item>QClipBlendNodeCreatedChangeBase</item>
+    <item>QClipBlendValue</item>
     <item>QClipboard</item>
+    <item>QClipPlane</item>
     <item>QCloseEvent</item>
     <item>QCocoaNativeContext</item>
     <item>QCocoaWindowFunctions</item>
@@ -833,6 +913,9 @@
     <item>QColor</item>
     <item>QColorDialog</item>
     <item>QColormap</item>
+    <item>QColorMask</item>
+    <item>QColorSpace</item>
+    <item>QColorTransform</item>
     <item>QColumnView</item>
     <item>QComboBox</item>
     <item>QCommandLineOption</item>
@@ -843,15 +926,29 @@
     <item>QCompassFilter</item>
     <item>QCompassReading</item>
     <item>QCompleter</item>
+    <item>QComponent</item>
+    <item>QComponentAddedChange</item>
+    <item>QComponentRemovedChange</item>
+    <item>QCompressedHelpInfo</item>
+    <item>QComputeCommand</item>
+    <item>QConcatenateTablesProxyModel</item>
+    <item>QConeGeometry</item>
+    <item>QConeMesh</item>
     <item>QConicalGradient</item>
     <item>QContextMenuEvent</item>
     <item>QContiguousCache</item>
     <item>QCoreApplication</item>
     <item>QCryptographicHash</item>
+    <item>QCuboidGeometry</item>
+    <item>QCuboidMesh</item>
+    <item>QCullFace</item>
     <item>QCursor</item>
     <item>QCustom3DItem</item>
     <item>QCustom3DLabel</item>
     <item>QCustom3DVolume</item>
+    <item>QCustomAudioRoleControl</item>
+    <item>QCylinderGeometry</item>
+    <item>QCylinderMesh</item>
     <item>QDataStream</item>
     <item>QDataWidgetMapper</item>
     <item>QDate</item>
@@ -882,6 +979,8 @@
     <item>QDeadlineTimer</item>
     <item>QDebug</item>
     <item>QDebugStateSaver</item>
+    <item>QDepthRange</item>
+    <item>QDepthTest</item>
     <item>QDesignerActionEditorInterface</item>
     <item>QDesignerContainerExtension</item>
     <item>QDesignerCustomWidgetCollectionInterface</item>
@@ -902,12 +1001,18 @@
     <item>QDial</item>
     <item>QDialog</item>
     <item>QDialogButtonBox</item>
+    <item>QDiffuseMapMaterial</item>
+    <item>QDiffuseSpecularMapMaterial</item>
+    <item>QDiffuseSpecularMaterial</item>
     <item>QDir</item>
+    <item>QDirectionalLight</item>
     <item>QDirIterator</item>
     <item>QDirModel</item>
+    <item>QDispatchCompute</item>
     <item>QDistanceFilter</item>
     <item>QDistanceReading</item>
     <item>QDistanceSensor</item>
+    <item>QDithering</item>
     <item>QDnsDomainNameRecord</item>
     <item>QDnsHostAddressRecord</item>
     <item>QDnsLookup</item>
@@ -939,13 +1044,19 @@
     <item>QDragLeaveEvent</item>
     <item>QDragMoveEvent</item>
     <item>QDropEvent</item>
+    <item>QDtls</item>
+    <item>QDtlsClientVerifier</item>
     <item>QDynamicPropertyChangeEvent</item>
+    <item>QDynamicPropertyUpdatedChange</item>
     <item>QEasingCurve</item>
+    <item>QEffect</item>
     <item>QEglFSFunctions</item>
     <item>QEGLNativeContext</item>
     <item>QElapsedTimer</item>
     <item>QEnableSharedFromThis</item>
     <item>QEnterEvent</item>
+    <item>QEntity</item>
+    <item>QEnvironmentLight</item>
     <item>QErrorMessage</item>
     <item>QEvent</item>
     <item>QEventLoop</item>
@@ -956,6 +1067,8 @@
     <item>QExposeEvent</item>
     <item>QExtensionFactory</item>
     <item>QExtensionManager</item>
+    <item>QExtrudedTextGeometry</item>
+    <item>QExtrudedTextMesh</item>
     <item>QFile</item>
     <item>QFileDevice</item>
     <item>QFileDialog</item>
@@ -965,9 +1078,12 @@
     <item>QFileSelector</item>
     <item>QFileSystemModel</item>
     <item>QFileSystemWatcher</item>
+    <item>QFilterKey</item>
     <item>QFinalState</item>
+    <item>QFirstPersonCameraController</item>
     <item>QFlag</item>
     <item>QFlags</item>
+    <item>qfloat16</item>
     <item>QFocusEvent</item>
     <item>QFocusFrame</item>
     <item>QFont</item>
@@ -979,12 +1095,20 @@
     <item>QFontMetricsF</item>
     <item>QFormBuilder</item>
     <item>QFormLayout</item>
+    <item>QForwardRenderer</item>
     <item>QFrame</item>
+    <item>QFrameAction</item>
+    <item>QFrameGraphNode</item>
+    <item>QFrameGraphNodeCreatedChangeBase</item>
+    <item>QFrontFace</item>
+    <item>QFrustumCulling</item>
     <item>QFuture</item>
     <item>QFutureIterator</item>
     <item>QFutureSynchronizer</item>
     <item>QFutureWatcher</item>
     <item>QGamepad</item>
+    <item>QGamepadKeyNavigation</item>
+    <item>QGamepadManager</item>
     <item>QGenericArgument</item>
     <item>QGenericMatrix</item>
     <item>QGenericPlugin</item>
@@ -998,13 +1122,20 @@
     <item>QGeoCodingManager</item>
     <item>QGeoCodingManagerEngine</item>
     <item>QGeoCoordinate</item>
+    <item>QGeoJson</item>
     <item>QGeoLocation</item>
     <item>QGeoManeuver</item>
+    <item>QGeometry</item>
+    <item>QGeometryRenderer</item>
+    <item>QGeoPath</item>
+    <item>QGeoPolygon</item>
     <item>QGeoPositionInfo</item>
     <item>QGeoPositionInfoSource</item>
     <item>QGeoPositionInfoSourceFactory</item>
+    <item>QGeoPositionInfoSourceFactoryV2</item>
     <item>QGeoRectangle</item>
     <item>QGeoRoute</item>
+    <item>QGeoRouteLeg</item>
     <item>QGeoRouteReply</item>
     <item>QGeoRouteRequest</item>
     <item>QGeoRouteSegment</item>
@@ -1014,6 +1145,7 @@
     <item>QGeoSatelliteInfoSource</item>
     <item>QGeoServiceProvider</item>
     <item>QGeoServiceProviderFactory</item>
+    <item>QGeoServiceProviderFactoryV2</item>
     <item>QGeoShape</item>
     <item>QGesture</item>
     <item>QGestureEvent</item>
@@ -1032,9 +1164,11 @@
     <item>QGLWidget</item>
     <item>QGLXNativeContext</item>
     <item>QGlyphRun</item>
+    <item>QGoochMaterial</item>
     <item>QGradient</item>
     <item>QGraphicsAnchor</item>
     <item>QGraphicsAnchorLayout</item>
+    <item>QGraphicsApiFilter</item>
     <item>QGraphicsBlurEffect</item>
     <item>QGraphicsColorizeEffect</item>
     <item>QGraphicsDropShadowEffect</item>
@@ -1071,9 +1205,9 @@
     <item>QGraphicsSvgItem</item>
     <item>QGraphicsTextItem</item>
     <item>QGraphicsTransform</item>
-    <item>QGraphicsVideoItem</item>
     <item>QGraphicsView</item>
     <item>QGraphicsWidget</item>
+    <item>QGregorianCalendar</item>
     <item>QGridLayout</item>
     <item>QGroupBox</item>
     <item>QGuiApplication</item>
@@ -1094,11 +1228,16 @@
     <item>QHelpEngine</item>
     <item>QHelpEngineCore</item>
     <item>QHelpEvent</item>
+    <item>QHelpFilterData</item>
+    <item>QHelpFilterEngine</item>
+    <item>QHelpFilterSettingsWidget</item>
     <item>QHelpIndexModel</item>
     <item>QHelpIndexWidget</item>
+    <item>QHelpLink</item>
     <item>QHelpSearchEngine</item>
     <item>QHelpSearchQuery</item>
     <item>QHelpSearchQueryWidget</item>
+    <item>QHelpSearchResult</item>
     <item>QHelpSearchResultWidget</item>
     <item>QHideEvent</item>
     <item>QHistoryState</item>
@@ -1112,8 +1251,13 @@
     <item>QHostInfo</item>
     <item>QHoverEvent</item>
     <item>QHPieModelMapper</item>
+    <item>QHstsPolicy</item>
+    <item>QHttp2Configuration</item>
     <item>QHttpMultiPart</item>
     <item>QHttpPart</item>
+    <item>QHumidityFilter</item>
+    <item>QHumidityReading</item>
+    <item>QHumiditySensor</item>
     <item>QHXYModelMapper</item>
     <item>QIcon</item>
     <item>QIconDragEvent</item>
@@ -1130,11 +1274,16 @@
     <item>QInAppProduct</item>
     <item>QInAppStore</item>
     <item>QInAppTransaction</item>
+    <item>QInputAspect</item>
+    <item>QInputChord</item>
+    <item>QInputDeviceIntegration</item>
     <item>QInputDialog</item>
     <item>QInputEvent</item>
     <item>QInputMethod</item>
     <item>QInputMethodEvent</item>
     <item>QInputMethodQueryEvent</item>
+    <item>QInputSequence</item>
+    <item>QInputSettings</item>
     <item>QIntValidator</item>
     <item>QIODevice</item>
     <item>QIRProximityFilter</item>
@@ -1150,6 +1299,8 @@
     <item>QItemSelection</item>
     <item>QItemSelectionModel</item>
     <item>QItemSelectionRange</item>
+    <item>QJalaliCalendar</item>
+    <item>QJoint</item>
     <item>QJSEngine</item>
     <item>QJsonArray</item>
     <item>QJsonDocument</item>
@@ -1158,20 +1309,37 @@
     <item>QJsonValue</item>
     <item>QJSValue</item>
     <item>QJSValueIterator</item>
+    <item>QJulianCalendar</item>
+    <item>QKeyboardDevice</item>
+    <item>QKeyboardHandler</item>
     <item>QKeyEvent</item>
+    <item>QKeyEvent</item>
     <item>QKeyEventTransition</item>
+    <item>QKeyFrame</item>
+    <item>QKeyframeAnimation</item>
     <item>QKeySequence</item>
     <item>QKeySequenceEdit</item>
+    <item>QKeyValueIterator</item>
     <item>QLabel</item>
     <item>QLatin1Char</item>
     <item>QLatin1String</item>
+    <item>QLayer</item>
+    <item>QLayerFilter</item>
     <item>QLayout</item>
     <item>QLayoutItem</item>
     <item>QLCDNumber</item>
     <item>QLegend</item>
     <item>QLegendMarker</item>
+    <item>QLEInteger</item>
+    <item>QLerpClipBlend</item>
+    <item>QLevelOfDetail</item>
+    <item>QLevelOfDetailBoundingSphere</item>
+    <item>QLevelOfDetailSwitch</item>
     <item>QLibrary</item>
     <item>QLibraryInfo</item>
+    <item>QLidFilter</item>
+    <item>QLidReading</item>
+    <item>QLidSensor</item>
     <item>QLightFilter</item>
     <item>QLightReading</item>
     <item>QLightSensor</item>
@@ -1180,8 +1348,10 @@
     <item>QLineEdit</item>
     <item>QLineF</item>
     <item>QLineSeries</item>
+    <item>QLineWidth</item>
     <item>QLinkedList</item>
     <item>QLinkedListIterator</item>
+    <item>QLinuxFbFunctions</item>
     <item>QList</item>
     <item>QListIterator</item>
     <item>QListView</item>
@@ -1192,6 +1362,8 @@
     <item>QLocalSocket</item>
     <item>QLockFile</item>
     <item>QLoggingCategory</item>
+    <item>QLogicalDevice</item>
+    <item>QLogicAspect</item>
     <item>QLogValue3DAxisFormatter</item>
     <item>QLogValueAxis</item>
     <item>QLowEnergyAdvertisingData</item>
@@ -1218,6 +1390,7 @@
     <item>QMargins</item>
     <item>QMarginsF</item>
     <item>QMaskGenerator</item>
+    <item>QMaterial</item>
     <item>QMatrix</item>
     <item>QMatrix4x4</item>
     <item>QMdiArea</item>
@@ -1248,8 +1421,10 @@
     <item>QMediaTimeInterval</item>
     <item>QMediaTimeRange</item>
     <item>QMediaVideoProbeControl</item>
+    <item>QMemoryBarrier</item>
     <item>QMenu</item>
     <item>QMenuBar</item>
+    <item>QMesh</item>
     <item>QMessageAuthenticationCode</item>
     <item>QMessageBox</item>
     <item>QMessageLogContext</item>
@@ -1258,10 +1433,12 @@
     <item>QMetaDataReaderControl</item>
     <item>QMetaDataWriterControl</item>
     <item>QMetaEnum</item>
+    <item>QMetalRoughMaterial</item>
     <item>QMetaMethod</item>
     <item>QMetaObject</item>
     <item>QMetaProperty</item>
     <item>QMetaType</item>
+    <item>QMilankovicCalendar</item>
     <item>QMimeData</item>
     <item>QMimeDatabase</item>
     <item>QMimeType</item>
@@ -1278,14 +1455,22 @@
     <item>QModbusRtuSerialSlave</item>
     <item>QModbusServer</item>
     <item>QModbusTcpClient</item>
+    <item>QModbusTcpConnectionObserver</item>
     <item>QModbusTcpServer</item>
     <item>QModelIndex</item>
+    <item>QMorphingAnimation</item>
+    <item>QMorphPhongMaterial</item>
+    <item>QMorphTarget</item>
+    <item>QMouseDevice</item>
     <item>QMouseEvent</item>
+    <item>QMouseEvent</item>
     <item>QMouseEventTransition</item>
+    <item>QMouseHandler</item>
     <item>QMoveEvent</item>
     <item>QMovie</item>
     <item>QMultiHash</item>
     <item>QMultiMap</item>
+    <item>QMultiSampleAntiAliasing</item>
     <item>QMutableHashIterator</item>
     <item>QMutableLinkedListIterator</item>
     <item>QMutableListIterator</item>
@@ -1322,8 +1507,25 @@
     <item>QNetworkRequest</item>
     <item>QNetworkSession</item>
     <item>QNmeaPositionInfoSource</item>
+    <item>QNode</item>
+    <item>QNodeCommand</item>
+    <item>QNodeCreatedChange</item>
+    <item>QNodeCreatedChangeBase</item>
+    <item>QNodeDestroyedChange</item>
+    <item>QNodeId</item>
+    <item>QNoDepthMask</item>
+    <item>QNoDraw</item>
+    <item>QNoPicking</item>
+    <item>QNormalDiffuseMapAlphaMaterial</item>
+    <item>QNormalDiffuseMapMaterial</item>
+    <item>QNormalDiffuseSpecularMapMaterial</item>
+    <item>QOAuth1</item>
+    <item>QOAuth1Signature</item>
+    <item>QOAuth2AuthorizationCodeFlow</item>
     <item>QObject</item>
     <item>QObjectCleanupHandler</item>
+    <item>QObjectPicker</item>
+    <item>QOcspResponse</item>
     <item>QOffscreenSurface</item>
     <item>QOpenGLBuffer</item>
     <item>QOpenGLContext</item>
@@ -1373,15 +1575,19 @@
     <item>QOpenGLVertexArrayObject</item>
     <item>QOpenGLWidget</item>
     <item>QOpenGLWindow</item>
+    <item>QOperatingSystemVersion</item>
+    <item>QOrbitCameraController</item>
     <item>QOrientationFilter</item>
     <item>QOrientationReading</item>
     <item>QOrientationSensor</item>
+    <item>qoutputrange</item>
     <item>QPagedPaintDevice</item>
     <item>QPageLayout</item>
     <item>QPageSetupDialog</item>
     <item>QPageSize</item>
     <item>QPaintDevice</item>
     <item>QPaintDeviceWindow</item>
+    <item>QPaintedTextureImage</item>
     <item>QPaintEngine</item>
     <item>QPaintEngineState</item>
     <item>QPainter</item>
@@ -1392,11 +1598,27 @@
     <item>QPalette</item>
     <item>QPanGesture</item>
     <item>QParallelAnimationGroup</item>
+    <item>QParameter</item>
     <item>QPauseAnimation</item>
+    <item>QPdfDestination</item>
+    <item>QPdfDocument</item>
+    <item>QPdfDocumentRenderOptions</item>
+    <item>QPdfPageNavigation</item>
+    <item>QPdfPageRenderer</item>
+    <item>QPdfSelection</item>
     <item>QPdfWriter</item>
     <item>QPen</item>
     <item>QPercentBarSeries</item>
     <item>QPersistentModelIndex</item>
+    <item>QPerVertexColorMaterial</item>
+    <item>QPhongAlphaMaterial</item>
+    <item>QPhongMaterial</item>
+    <item>QPhysicalDeviceCreatedChangeBase</item>
+    <item>QPickEvent</item>
+    <item>QPickingSettings</item>
+    <item>QPickLineEvent</item>
+    <item>QPickPointEvent</item>
+    <item>QPickTriangleEvent</item>
     <item>QPicture</item>
     <item>QPictureFormatPlugin</item>
     <item>QPictureIO</item>
@@ -1436,17 +1658,20 @@
     <item>QPlaceUser</item>
     <item>QPlainTextDocumentLayout</item>
     <item>QPlainTextEdit</item>
-    <item>QPlatformGraphicsBuffer</item>
+    <item>QPlaneGeometry</item>
+    <item>QPlaneMesh</item>
     <item>QPlatformSurfaceEvent</item>
-    <item>QPlatformSystemTrayIcon</item>
     <item>QPluginLoader</item>
     <item>QPoint</item>
     <item>QPointer</item>
     <item>QPointF</item>
     <item>QPointingDeviceUniqueId</item>
+    <item>QPointLight</item>
+    <item>QPointSize</item>
     <item>QPolarChart</item>
     <item>QPolygon</item>
     <item>QPolygonF</item>
+    <item>QPolygonOffset</item>
     <item>QPressureFilter</item>
     <item>QPressureReading</item>
     <item>QPressureSensor</item>
@@ -1461,19 +1686,29 @@
     <item>QProgressBar</item>
     <item>QProgressDialog</item>
     <item>QPropertyAnimation</item>
+    <item>QPropertyNodeAddedChange</item>
+    <item>QPropertyNodeRemovedChange</item>
+    <item>QPropertyUpdatedChange</item>
+    <item>QPropertyUpdatedChangeBase</item>
+    <item>QPropertyValueAddedChange</item>
+    <item>QPropertyValueAddedChangeBase</item>
+    <item>QPropertyValueRemovedChange</item>
+    <item>QPropertyValueRemovedChangeBase</item>
     <item>QProximityFilter</item>
+    <item>QProximityFilter</item>
     <item>QProximityReading</item>
     <item>QProximitySensor</item>
     <item>QProxyStyle</item>
     <item>QPushButton</item>
     <item>QQmlAbstractUrlInterceptor</item>
     <item>QQmlApplicationEngine</item>
+    <item>QQmlAspectEngine</item>
     <item>QQmlComponent</item>
     <item>QQmlContext</item>
     <item>QQmlEngine</item>
+    <item>QQmlEngineExtensionPlugin</item>
     <item>QQmlError</item>
     <item>QQmlExpression</item>
-    <item>QQmlExtensionPlugin</item>
     <item>QQmlFileSelector</item>
     <item>QQmlImageProviderBase</item>
     <item>QQmlIncubationController</item>
@@ -1489,6 +1724,9 @@
     <item>QQmlScriptString</item>
     <item>QQuaternion</item>
     <item>QQueue</item>
+    <item>QQuick3D</item>
+    <item>QQuick3DGeometry</item>
+    <item>QQuick3DObject</item>
     <item>QQuickAsyncImageProvider</item>
     <item>QQuickFramebufferObject</item>
     <item>QQuickImageProvider</item>
@@ -1502,6 +1740,7 @@
     <item>QQuickTextureFactory</item>
     <item>QQuickView</item>
     <item>QQuickWebEngineProfile</item>
+    <item>QQuickWebEngineScript</item>
     <item>QQuickWidget</item>
     <item>QQuickWindow</item>
     <item>QRadialGradient</item>
@@ -1510,13 +1749,19 @@
     <item>QRadioDataControl</item>
     <item>QRadioTuner</item>
     <item>QRadioTunerControl</item>
+    <item>QRandomGenerator</item>
+    <item>QRandomGenerator64</item>
+    <item>QRasterMode</item>
     <item>QRasterPaintEngine</item>
     <item>QRasterWindow</item>
     <item>QRawFont</item>
+    <item>QRayCaster</item>
+    <item>QRayCasterHit</item>
     <item>QReadLocker</item>
     <item>QReadWriteLock</item>
     <item>QRect</item>
     <item>QRectF</item>
+    <item>QRecursiveMutex</item>
     <item>QRegExp</item>
     <item>QRegExpValidator</item>
     <item>QRegion</item>
@@ -1524,9 +1769,34 @@
     <item>QRegularExpressionMatch</item>
     <item>QRegularExpressionMatchIterator</item>
     <item>QRegularExpressionValidator</item>
+    <item>QRemoteObjectAbstractPersistedStore</item>
+    <item>QRemoteObjectDynamicReplica</item>
+    <item>QRemoteObjectHost</item>
+    <item>QRemoteObjectHostBase</item>
+    <item>QRemoteObjectNode</item>
+    <item>QRemoteObjectPendingCall</item>
+    <item>QRemoteObjectPendingCallWatcher</item>
+    <item>QRemoteObjectPendingReply</item>
+    <item>QRemoteObjectRegistry</item>
+    <item>QRemoteObjectRegistryHost</item>
+    <item>QRemoteObjectReplica</item>
+    <item>QRenderAspect</item>
+    <item>QRenderCapabilities</item>
+    <item>QRenderCapture</item>
+    <item>QRenderCaptureReply</item>
+    <item>QRenderPass</item>
+    <item>QRenderPassFilter</item>
+    <item>QRenderSettings</item>
+    <item>QRenderState</item>
+    <item>QRenderStateSet</item>
+    <item>QRenderSurfaceSelector</item>
+    <item>QRenderTarget</item>
+    <item>QRenderTargetOutput</item>
+    <item>QRenderTargetSelector</item>
     <item>QResizeEvent</item>
     <item>QResource</item>
     <item>QRgba64</item>
+    <item>QRomanCalendar</item>
     <item>QRotationFilter</item>
     <item>QRotationReading</item>
     <item>QRotationSensor</item>
@@ -1537,10 +1807,16 @@
     <item>QScatterDataItem</item>
     <item>QScatterDataProxy</item>
     <item>QScatterSeries</item>
+    <item>QScene2D</item>
+    <item>QSceneChange</item>
+    <item>QSceneLoader</item>
+    <item>QScissorTest</item>
     <item>QScopedArrayPointer</item>
     <item>QScopedPointer</item>
     <item>QScopedValueRollback</item>
+    <item>QScopeGuard</item>
     <item>QScreen</item>
+    <item>QScreenRayCaster</item>
     <item>QScriptable</item>
     <item>QScriptClass</item>
     <item>QScriptClassPropertyIterator</item>
@@ -1576,7 +1852,9 @@
     <item>QScxmlStateMachine</item>
     <item>QScxmlStaticScxmlServiceFactory</item>
     <item>QScxmlTableData</item>
+    <item>QSeamlessCubemap</item>
     <item>QSemaphore</item>
+    <item>QSemaphoreReleaser</item>
     <item>QSensor</item>
     <item>QSensorBackend</item>
     <item>QSensorBackendFactory</item>
@@ -1595,6 +1873,7 @@
     <item>QSerialPortInfo</item>
     <item>QSessionManager</item>
     <item>QSet</item>
+    <item>QSetFence</item>
     <item>QSetIterator</item>
     <item>QSettings</item>
     <item>QSGAbstractRenderer</item>
@@ -1607,6 +1886,7 @@
     <item>QSGGeometryNode</item>
     <item>QSGImageNode</item>
     <item>QSGMaterial</item>
+    <item>QSGMaterialRhiShader</item>
     <item>QSGMaterialShader</item>
     <item>QSGMaterialType</item>
     <item>QSGNode</item>
@@ -1624,8 +1904,13 @@
     <item>QSGTextureProvider</item>
     <item>QSGTransformNode</item>
     <item>QSGVertexColorMaterial</item>
+    <item>QShaderData</item>
+    <item>QShaderImage</item>
+    <item>QShaderProgram</item>
+    <item>QShaderProgramBuilder</item>
     <item>QSharedData</item>
     <item>QSharedDataPointer</item>
+    <item>QSharedGLTexture</item>
     <item>QSharedMemory</item>
     <item>QSharedPointer</item>
     <item>QShortcut</item>
@@ -1640,18 +1925,25 @@
     <item>QSizeF</item>
     <item>QSizeGrip</item>
     <item>QSizePolicy</item>
+    <item>QSkeleton</item>
+    <item>QSkeletonLoader</item>
+    <item>QSkyboxEntity</item>
     <item>QSlider</item>
     <item>QSocketNotifier</item>
     <item>QSortFilterProxyModel</item>
+    <item>QSortPolicy</item>
     <item>QSound</item>
     <item>QSoundEffect</item>
     <item>QSourceLocation</item>
     <item>QSpacerItem</item>
+    <item>QSphereGeometry</item>
+    <item>QSphereMesh</item>
     <item>QSpinBox</item>
     <item>QSplashScreen</item>
     <item>QSplineSeries</item>
     <item>QSplitter</item>
     <item>QSplitterHandle</item>
+    <item>QSpotLight</item>
     <item>QSqlDatabase</item>
     <item>QSqlDriver</item>
     <item>QSqlDriverCreator</item>
@@ -1688,16 +1980,26 @@
     <item>QStandardPaths</item>
     <item>QState</item>
     <item>QStateMachine</item>
+    <item>QStaticByteArrayMatcher</item>
     <item>QStaticPlugin</item>
+    <item>QStaticPropertyUpdatedChangeBase</item>
+    <item>QStaticPropertyValueAddedChangeBase</item>
+    <item>QStaticPropertyValueRemovedChangeBase</item>
     <item>QStaticText</item>
     <item>QStatusBar</item>
     <item>QStatusTipEvent</item>
+    <item>QStencilMask</item>
+    <item>QStencilOperation</item>
+    <item>QStencilOperationArguments</item>
+    <item>QStencilTest</item>
+    <item>QStencilTestArguments</item>
     <item>QStorageInfo</item>
     <item>QString</item>
     <item>QStringList</item>
     <item>QStringListModel</item>
     <item>QStringMatcher</item>
     <item>QStringRef</item>
+    <item>QStringView</item>
     <item>QStyle</item>
     <item>QStyledItemDelegate</item>
     <item>QStyleFactory</item>
@@ -1731,6 +2033,7 @@
     <item>QStyleOptionViewItem</item>
     <item>QStylePainter</item>
     <item>QStylePlugin</item>
+    <item>QSubtreeEnabler</item>
     <item>QSupportedWritingSystems</item>
     <item>QSurface</item>
     <item>QSurface3DSeries</item>
@@ -1759,9 +2062,12 @@
     <item>QTapSensor</item>
     <item>QTcpServer</item>
     <item>QTcpSocket</item>
+    <item>QTechnique</item>
+    <item>QTechniqueFilter</item>
     <item>QTemporaryDir</item>
     <item>QTemporaryFile</item>
     <item>QTestEventList</item>
+    <item>QText2DEntity</item>
     <item>QTextBlock</item>
     <item>QTextBlockFormat</item>
     <item>QTextBlockGroup</item>
@@ -1798,7 +2104,29 @@
     <item>QTextTableCellFormat</item>
     <item>QTextTableFormat</item>
     <item>QTextToSpeech</item>
+    <item>QTextToSpeechEngine</item>
     <item>QTextToSpeechPlugin</item>
+    <item>QTexture1D</item>
+    <item>QTexture1DArray</item>
+    <item>QTexture2D</item>
+    <item>QTexture2DArray</item>
+    <item>QTexture2DMultisample</item>
+    <item>QTexture2DMultisampleArray</item>
+    <item>QTexture3D</item>
+    <item>QTextureBuffer</item>
+    <item>QTextureCubeMap</item>
+    <item>QTextureCubeMapArray</item>
+    <item>QTextureData</item>
+    <item>QTextureDataUpdate</item>
+    <item>QTexturedMetalRoughMaterial</item>
+    <item>QTextureGenerator</item>
+    <item>QTextureImage</item>
+    <item>QTextureImageData</item>
+    <item>QTextureImageDataGenerator</item>
+    <item>QTextureLoader</item>
+    <item>QTextureMaterial</item>
+    <item>QTextureRectangle</item>
+    <item>QTextureWrapMode</item>
     <item>QThread</item>
     <item>QThreadPool</item>
     <item>QThreadStorage</item>
@@ -1816,15 +2144,22 @@
     <item>QToolBox</item>
     <item>QToolButton</item>
     <item>QToolTip</item>
+    <item>QTorusGeometry</item>
+    <item>QTorusMesh</item>
     <item>QTouch3DInputHandler</item>
     <item>QTouchDevice</item>
     <item>QTouchEvent</item>
+    <item>QTouchEventSequence</item>
     <item>QTransform</item>
+    <item>QTransform</item>
     <item>QTranslator</item>
+    <item>QTransposeProxyModel</item>
     <item>QTreeView</item>
     <item>QTreeWidget</item>
     <item>QTreeWidgetItem</item>
     <item>QTreeWidgetItemIterator</item>
+    <item>QtROClientFactory</item>
+    <item>QtROServerFactory</item>
     <item>QUdpSocket</item>
     <item>QUiLoader</item>
     <item>QUndoCommand</item>
@@ -1852,6 +2187,7 @@
     <item>QVector4D</item>
     <item>QVectorIterator</item>
     <item>QVersionNumber</item>
+    <item>QVertexBlendAnimation</item>
     <item>QVideoDeviceSelectorControl</item>
     <item>QVideoEncoderSettings</item>
     <item>QVideoEncoderSettingsControl</item>
@@ -1863,46 +2199,81 @@
     <item>QVideoWidget</item>
     <item>QVideoWidgetControl</item>
     <item>QVideoWindowControl</item>
+    <item>QViewport</item>
+    <item>QVirtualKeyboardAbstractInputMethod</item>
+    <item>QVirtualKeyboardExtensionPlugin</item>
+    <item>QVirtualKeyboardInputContext</item>
+    <item>QVirtualKeyboardInputEngine</item>
+    <item>QVirtualKeyboardSelectionListModel</item>
+    <item>QVirtualKeyboardTrace</item>
+    <item>QVoice</item>
     <item>QVPieModelMapper</item>
+    <item>QVulkanDeviceFunctions</item>
+    <item>QVulkanExtension</item>
+    <item>QVulkanFunctions</item>
+    <item>QVulkanInfoVector</item>
+    <item>QVulkanInstance</item>
+    <item>QVulkanLayer</item>
+    <item>QVulkanWindow</item>
+    <item>QVulkanWindowRenderer</item>
     <item>QVXYModelMapper</item>
     <item>QWaitCondition</item>
+    <item>QWaitFence</item>
     <item>QWaylandBufferRef</item>
     <item>QWaylandClient</item>
     <item>QWaylandCompositor</item>
+    <item>QWaylandIdleInhibitManagerV1</item>
+    <item>QWaylandIviApplication</item>
     <item>QWaylandIviSurface</item>
     <item>QWaylandKeyboard</item>
     <item>QWaylandOutput</item>
     <item>QWaylandOutputMode</item>
     <item>QWaylandPointer</item>
     <item>QWaylandQuickItem</item>
+    <item>QWaylandQuickShellIntegration</item>
     <item>QWaylandQuickShellSurfaceItem</item>
     <item>QWaylandSeat</item>
+    <item>QWaylandShellSurface</item>
     <item>QWaylandSurface</item>
     <item>QWaylandSurfaceGrabber</item>
     <item>QWaylandTouch</item>
     <item>QWaylandView</item>
+    <item>QWaylandViewporter</item>
+    <item>QWaylandWlScaler</item>
     <item>QWaylandWlShell</item>
     <item>QWaylandWlShellSurface</item>
+    <item>QWaylandXdgDecorationManagerV1</item>
+    <item>QWaylandXdgOutputManagerV1</item>
+    <item>QWaylandXdgPopup</item>
     <item>QWaylandXdgPopupV5</item>
+    <item>QWaylandXdgPopupV6</item>
+    <item>QWaylandXdgShell</item>
+    <item>QWaylandXdgShellV5</item>
+    <item>QWaylandXdgShellV6</item>
+    <item>QWaylandXdgSurface</item>
     <item>QWaylandXdgSurfaceV5</item>
+    <item>QWaylandXdgSurfaceV6</item>
+    <item>QWaylandXdgToplevel</item>
+    <item>QWaylandXdgToplevelV6</item>
     <item>QWeakPointer</item>
     <item>QWebChannel</item>
     <item>QWebChannelAbstractTransport</item>
-    <item>QWebEngineCertificateError</item>
-    <item>QWebEngineContextMenuData</item>
+    <item>QWebEngineClientCertificateStore</item>
     <item>QWebEngineCookieStore</item>
-    <item>QWebEngineDownloadItem</item>
-    <item>QWebEngineFullScreenRequest</item>
-    <item>QWebEngineHistory</item>
-    <item>QWebEngineHistoryItem</item>
+    <item>QWebEngineFindTextResult</item>
+    <item>QWebEngineHttpRequest</item>
+    <item>QWebEngineNotification</item>
     <item>QWebEnginePage</item>
     <item>QWebEngineProfile</item>
+    <item>QWebEngineQuotaRequest</item>
+    <item>QWebEngineRegisterProtocolHandlerRequest</item>
     <item>QWebEngineScript</item>
     <item>QWebEngineScriptCollection</item>
     <item>QWebEngineSettings</item>
     <item>QWebEngineUrlRequestInfo</item>
     <item>QWebEngineUrlRequestInterceptor</item>
     <item>QWebEngineUrlRequestJob</item>
+    <item>QWebEngineUrlScheme</item>
     <item>QWebEngineUrlSchemeHandler</item>
     <item>QWebEngineView</item>
     <item>QWebSocket</item>
@@ -1912,6 +2283,7 @@
     <item>QWhatsThis</item>
     <item>QWhatsThisClickedEvent</item>
     <item>QWheelEvent</item>
+    <item>QWheelEvent</item>
     <item>QWidget</item>
     <item>QWidgetAction</item>
     <item>QWidgetItem</item>
@@ -1967,6 +2339,7 @@
     <item>QXYLegendMarker</item>
     <item>QXYSeries</item>
     <!-- Not actually classes, but used like those -->
+    <item>QByteArrayLiteral</item>
     <item>QStringLiteral</item>
     <!-- Not actually classes, but namespaces -->
     <item>Qt</item>
diff --git a/xml/cs.xml b/xml/cs.xml
--- a/xml/cs.xml
+++ b/xml/cs.xml
@@ -104,10 +104,10 @@
         <Detect2Chars attribute="Comment" context="MatchComment" char="/" char1="*" lookAhead="true" />
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="block1"/>
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="block1"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\bpartial(?=\s+(class|struct|interface|void))"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\bpartial(?=\s+(?:class|struct|interface|void))"/>
         <RegExpr attribute="Data Type" context="#stay" String="\bvar(?=\s+\w+)"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\byield(?=\s+(return|break))"/>
-        <RegExpr attribute="Keyword" context="#stay" String="\b(set|get)(?=\s*[;{])"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\byield(?=\s+(?:return|break))"/>
+        <RegExpr attribute="Keyword" context="#stay" String="\b(?:set|get)(?=\s*[;{])"/>
         <RegExpr attribute="Keyword" context="#stay" String="\bglobal(?=\s*::\s*\w+)"/>
         <StringDetect attribute="Decimal" context="Decimal" String="#region" beginRegion="Region1"/>
         <StringDetect attribute="Decimal" context="Decimal" String="#endregion" endRegion="Region1"/>
@@ -116,17 +116,12 @@
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/*&lt;=&gt;?[]|~^&#59;"/>
       </context>
       <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-          <AnyChar String="fF" attribute="Float" context="#pop"/>
+          <AnyChar String="dDfFmM" attribute="Float" context="#pop"/>
       </context>
       <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+          <AnyChar attribute="Decimal" context="#pop" String="ULul"/>
       </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#pop"/>
diff --git a/xml/css.xml b/xml/css.xml
--- a/xml/css.xml
+++ b/xml/css.xml
@@ -38,7 +38,7 @@
 
 -->
 
-<language name="CSS" version="12" kateversion="5.0" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
+<language name="CSS" version="12" kateversion="5.53" section="Markup" extensions="*.css" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
     <!-- https://www.w3.org/Style/CSS/current-work -->
 
     <highlighting>
diff --git a/xml/curry.xml b/xml/curry.xml
--- a/xml/curry.xml
+++ b/xml/curry.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE language SYSTEM "language.dtd"
 [
   <!-- qualification of entities -->
-  <!ENTITY qualify     "([A-Z][a-zA-Z0-9_']*\.)*">
+  <!ENTITY qualify     "(?:[A-Z][a-zA-Z0-9_']*\.)*">
   <!-- identifier -->
   <!ENTITY ident       "[a-z][a-zA-Z0-9_']*">
   <!-- Type -->
@@ -10,7 +10,7 @@
   <!-- infix operator characters -->
   <!ENTITY infixchar   "~!@#\$&#37;\^&amp;\*\+\-=&lt;&gt;\?\./\|&backslash;:">
   <!-- identifier in prefix notation, e.g.: id, ($) -->
-  <!ENTITY prefixIdent "(&ident;|\([&infixchar;]+\))">
+  <!ENTITY prefixIdent "(?:&ident;|\([&infixchar;]+\))">
 
   <!-- Characters allowed in character escape sequence, e.g., \n -->
   <!ENTITY escSeqChar  "abfnrtv\&quot;'" >
@@ -194,19 +194,19 @@
       <keyword      attribute="Prelude Function"    context="#stay"   String="Prelude Func" />
       <keyword      attribute="Prelude Type"        context="#stay"   String="Prelude Type" />
       <keyword      attribute="Prelude Constructor" context="#stay"   String="Prelude Cons" />
-      <RegExpr      attribute="Keyword"             context="Import"  String="import\s+(qualified)?" />
+      <RegExpr      attribute="Keyword"             context="Import"  String="import\s+(?:qualified)?" />
 
       <!-- Literals -->
       <Float        attribute="Float"   context="#stay"   />
-      <RegExpr      attribute="Octal"   context="#stay"   String="0(o|O)&octal;" />
+      <RegExpr      attribute="Octal"   context="#stay"   String="0[oO]&octal;" />
       <HlCHex       attribute="Hex"     context="#stay"   />
       <Int          attribute="Decimal" context="#stay"   />
       <DetectChar   attribute="Char"    context="Char"    char="'" />
       <DetectChar   attribute="String"  context="String"  char="&quot;" />
 
       <!-- Others -->
-      <RegExpr      attribute="Special Symbol"    context="#stay"   String="(::|:=|:&gt;|\-&gt;|&lt;\-|\.\.)" />
-      <RegExpr      attribute="Signature"         context="#stay"   String="\s*&prefixIdent;\s*(,\s*&prefixIdent;)*\s*(?=::[^&infixchar;])" />
+      <RegExpr      attribute="Special Symbol"    context="#stay"   String="(?:::|:=|:&gt;|\-&gt;|&lt;\-|\.\.)" />
+      <RegExpr      attribute="Signature"         context="#stay"   String="\s*&prefixIdent;\s*(?:,\s*&prefixIdent;)*\s*(?=::[^&infixchar;])" />
       <RegExpr      attribute="Function"          context="#stay"   String="&qualify;&ident;" />
       <RegExpr      attribute="Operator"          context="#stay"   String="&qualify;[&infixchar;]+" />
       <RegExpr      attribute="Type, Constructor" context="#stay"   String="&qualify;&type;" />
@@ -264,18 +264,18 @@
     </context>
 
     <!-- Character escape sequence -->
-    <context name="CharEscape" attribute="Char" lineEndContext="#popCharSyntaxError" >
-      <AnyChar attribute="Char"         context="#popCharEnd" String="&escSeqChar;"   />
-      <RegExpr attribute="Char"         context="#popCharEnd" String="o&octal;"       />
-      <RegExpr attribute="Char"         context="#popCharEnd" String="&decimal;"      />
-      <RegExpr attribute="Char"         context="#popCharEnd" String="x&hexadecimal;" />
-      <RegExpr attribute="Char"         context="#popCharEnd" String="&escSeqCntrl;"  />
-      <RegExpr attribute="Char"         context="#popCharEnd" String="&escSeqAscii;"  />
-      <RegExpr attribute="Syntax Error" context="#popCharEnd" String="."              />
+    <context name="CharEscape" attribute="Char" lineEndContext="#pop!CharSyntaxError" >
+      <AnyChar attribute="Char"         context="#pop!CharEnd" String="&escSeqChar;"   />
+      <RegExpr attribute="Char"         context="#pop!CharEnd" String="o&octal;"       />
+      <RegExpr attribute="Char"         context="#pop!CharEnd" String="&decimal;"      />
+      <RegExpr attribute="Char"         context="#pop!CharEnd" String="x&hexadecimal;" />
+      <RegExpr attribute="Char"         context="#pop!CharEnd" String="&escSeqCntrl;"  />
+      <RegExpr attribute="Char"         context="#pop!CharEnd" String="&escSeqAscii;"  />
+      <RegExpr attribute="Syntax Error" context="#pop!CharEnd" String="."              />
     </context>
 
     <!-- Ending quote of character literal -->
-    <context name="CharEnd" attribute="Char" lineEndContext="#popCharSyntaxError" >
+    <context name="CharEnd" attribute="Char" lineEndContext="#pop!CharSyntaxError" >
       <DetectChar attribute="Char"         context="#pop#pop" char="'" />
       <RegExpr    attribute="Syntax Error" context="#stay"    String="." />
     </context>
@@ -306,7 +306,7 @@
 
     <context name="StringGap" attribute="String" lineEndContext="#stay" >
       <DetectSpaces attribute="String Escape" context="#stay" />
-      <DetectChar   attribute="String Escape" context="#pop#pop#popString" char="\"      />
+      <DetectChar   attribute="String Escape" context="#pop#pop#pop!String" char="\"      />
       <DetectChar   attribute="Syntax Error"  context="#pop#pop#pop"       char="&quot;" />
       <RegExpr      attribute="Syntax Error"  context="#stay"              String="."    />
     </context>
diff --git a/xml/d.xml b/xml/d.xml
--- a/xml/d.xml
+++ b/xml/d.xml
@@ -402,7 +402,7 @@
         <Detect2Chars attribute="Normal Text"   char="." char1="."/>
         
         <!-- Float starting with a dot -->
-        <RegExpr attribute="Float" context="#stay" String="\.\d[\d_]*([eE][-+]?\d[\d_]*)?[fFL]?i?"/>
+        <RegExpr attribute="Float" context="#stay" String="\.\d[\d_]*(?:[eE][-+]?\d[\d_]*)?[fFL]?i?"/>
         
         <!-- Try to match various built-in properties -->
         <DetectChar char="." attribute="Normal Text" context="Properties"/>
@@ -476,26 +476,26 @@
       <context name="NumberLiteral" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
         <!-- Float literals -->
         <!-- Floats must be matched before Binary|Octal|Hex|DecInteger -->
-        <RegExpr attribute="Float" context="#pop" String="0[xX][\da-fA-F_]*(\.[\da-fA-F_]*)?[pP][-+]?\d[\d_]*[fFL]?i?"/>
+        <RegExpr attribute="Float" context="#pop" String="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 -->
         <!-- RegExpr is branched rather than using look aheads for efficiency at the expense of extra length -->
-        <RegExpr attribute="Float" context="#pop" String="\d[_\d]*(\.(?!\.)[_\d]*([eE][-+]?\d[_\d]*)?[fFL]?i?|[eE][-+]?\d[_\d]*[fFL]?i?|[fF]i?|[fFL]?i)"/>
+        <RegExpr attribute="Float" context="#pop" String="\d[_\d]*(?:\.(?!\.)[_\d]*(?:[eE][-+]?\d[_\d]*)?[fFL]?i?|[eE][-+]?\d[_\d]*[fFL]?i?|[fF]i?|[fFL]?i)"/>
         
         <!-- Binary|Octal|Hex|DecInteger -->
         <!-- Common, optional suffix: (L[uU]?|[uU]L?)? -->
-        <RegExpr attribute="Binary"  context="#pop" String="0[bB]_*[01][01_]*(L[uU]?|[uU]L?)?"/>
+        <RegExpr attribute="Binary"  context="#pop" String="0[bB]_*[01][01_]*(?:L[uU]?|[uU]L?)?"/>
         <!-- Octal must be matched before DecInteger -->
-        <RegExpr attribute="Octal"   context="#pop" String="0[0-7_]+(L[uU]?|[uU]L?)?"/>
-        <RegExpr attribute="Hex"     context="#pop" String="0[xX]_*[\da-fA-F][\da-fA-F_]*(L[uU]?|[uU]L?)?"/>
+        <RegExpr attribute="Octal"   context="#pop" String="0[0-7_]+(?:L[uU]?|[uU]L?)?"/>
+        <RegExpr attribute="Hex"     context="#pop" String="0[xX]_*[\da-fA-F][\da-fA-F_]*(?:L[uU]?|[uU]L?)?"/>
         <!-- Decimal integers must be matched last -->
-        <RegExpr attribute="Integer" context="#pop" String="\d+[\d_]*(L[uU]?|[uU]L?)?"/>
+        <RegExpr attribute="Integer" context="#pop" String="\d+[\d_]*(?:L[uU]?|[uU]L?)?"/>
       </context>
 
       <context name="LinePragma" attribute="Pragma" lineEndContext="#pop">
         <DetectSpaces/>
         <!-- Match an Integer -->
-        <RegExpr attribute="Integer" context="#stay" String="((0([0-7_]+|[bB]_*[01][01_]*|[xX]_*[\da-fA-F][\da-fA-F_]*))|\d+[\d_]*)(L[uU]?|[uU]L?)?"/>
+        <RegExpr attribute="Integer" context="#stay" String="(?:(?:0(?:[0-7_]+|[bB]_*[01][01_]*|[xX]_*[\da-fA-F][\da-fA-F_]*))|\d+[\d_]*)(?:L[uU]?|[uU]L?)?"/>
         <RegExpr attribute="String" context="#stay" String="&quot;[^&quot;]*&quot;"/>
         <keyword attribute="SpecialTokens"  context="#stay"      String="specialtokens"/>
         <IncludeRules context="CommentRules" />
@@ -563,7 +563,7 @@
       <context name="VersionSpec" attribute="Normal Text" lineEndContext="#stay">
         <DetectSpaces/>
         <DetectIdentifier attribute="Normal Text" context="#stay"/>
-        <RegExpr attribute="Integer" context="#stay" String="\d+[\d_]*(L[uU]?|[uU]L?)?"/>
+        <RegExpr attribute="Integer" context="#stay" String="\d+[\d_]*(?:L[uU]?|[uU]L?)?"/>
         <DetectChar char=";" attribute="Normal Text" context="#pop#pop"/>
         <RegExpr String="." attribute="Error" context="#pop#pop"/>
       </context>
@@ -571,7 +571,7 @@
         <DetectSpaces/>
         <keyword    attribute="Version Type" context="#stay" String="vtypes"/>
         <DetectIdentifier attribute="Normal Text" context="#stay"/>
-        <RegExpr attribute="Integer" context="#stay" String="\d+[\d_]*(L[uU]?|[uU]L?)?"/>
+        <RegExpr attribute="Integer" context="#stay" String="\d+[\d_]*(?:L[uU]?|[uU]L?)?"/>
         <IncludeRules context="CommentRules" />
         <!-- Fall-through rules, highlighting errors: -->
         <DetectChar char=")" attribute="Normal Text" context="#pop#pop"/>
@@ -646,7 +646,7 @@
         <!-- \t \n \r etc. -->
         <HlCStringChar attribute="EscapeSequence" context="CharLiteralClosing"/>
         <!-- \u 4HexDigits | \U 8HexDigits | HTMLEntity -->
-        <RegExpr attribute="EscapeSequence" context="CharLiteralClosing" String="\\(u[\da-fA-F]{4}|U[\da-fA-F]{8}|&amp;[a-zA-Z]\w+;)"/>
+        <RegExpr attribute="EscapeSequence" context="CharLiteralClosing" String="\\(?:u[\da-fA-F]{4}|U[\da-fA-F]{8}|&amp;[a-zA-Z]\w+;)"/>
         <!-- Invalid escape sequences -->
         <RegExpr attribute="Error" context="CharLiteralClosing" String="\\."/>
         <!-- Any character -->
@@ -675,8 +675,8 @@
       <!-- delimited strings -->
       <!-- q"IDENTIFIER...IDENTIFIER" -->
       <context name="DelimStrHeredoc" attribute="Delimited String Content" lineEndContext="#stay">
-        <RegExpr attribute="Delimited String Delimiter" context="#pop" String="^%1&quot;" dynamic="true" />
-        <RegExpr attribute="Error" context="#pop" String="^%1" dynamic="true" />
+        <StringDetect attribute="Delimited String Delimiter" context="#pop" String="%1&quot;" dynamic="true" column="0" />
+        <StringDetect attribute="Error" context="#pop" String="%1" dynamic="true" column="0" />
       </context>
       <!-- q"[...]" -->
       <context name="DelimStrBracket" attribute="Delimited String Content" lineEndContext="#stay">
@@ -762,7 +762,7 @@
         <DetectSpaces />
         <DetectIdentifier attribute="Ddoc"/>
         <Detect2Chars attribute="Macros" context="DdocMacro" char="$" char1="(" />
-        <RegExpr attribute="DdocSection" context="#stay" String="[\w_]+:($|\s)" />
+        <RegExpr attribute="DdocSection" context="#stay" String="[\w_]+:(?:$|\s)" />
         <IncludeRules context="##Comments" />
       </context>
       
@@ -773,14 +773,14 @@
         <DetectChar attribute="Comment" context="#stay" char="*" firstNonSpace="true" />
         
         <Detect2Chars attribute="Macros" context="DdocMacro" char="$" char1="(" />
-        <RegExpr attribute="DdocSection" context="#stay" String="[\w_]+:($|\s)" />
+        <RegExpr attribute="DdocSection" context="#stay" String="[\w_]+:(?:$|\s)" />
         <IncludeRules context="##Comments" />
         
         <!-- Avoid matching this; do it this way since (^|\s)-* always matches .- and \s-* never
              matches .- (spaces have already been matched); however -*($|\s) matches just fine.
              Also can't use \b since - is not a word character. -->
         <RegExpr attribute="Ddoc" context="#stay" String="[^-]-{3,}" />
-        <RegExpr attribute="Comment" context="DdocBlockCode" String="-{3,}($|\s)" />
+        <RegExpr attribute="Comment" context="DdocBlockCode" String="-{3,}(?:$|\s)" />
       </context>
       
       <context name="DdocNested" attribute="Ddoc" lineEndContext="#stay">
@@ -792,12 +792,12 @@
         <DetectChar attribute="Comment" context="#stay" char="+" firstNonSpace="true" />
         
         <Detect2Chars attribute="Macros" context="DdocMacro" char="$" char1="(" />
-        <RegExpr attribute="DdocSection" context="#stay" String="[\w_]+:($|\s)" />
+        <RegExpr attribute="DdocSection" context="#stay" String="[\w_]+:(?:$|\s)" />
         <IncludeRules context="##Comments" />
         
         <!-- As above. -->
         <RegExpr attribute="Ddoc" context="#stay" String="[^-]-{3,}" />
-        <RegExpr attribute="Comment" context="DdocNestedCode" String="-{3,}($|\s)" />
+        <RegExpr attribute="Comment" context="DdocNestedCode" String="-{3,}(?:$|\s)" />
       </context>
       
       <context name="DdocNested2" attribute="Ddoc" lineEndContext="#stay">
@@ -844,7 +844,7 @@
         <DetectChar attribute="Comment" context="#stay" char="*" firstNonSpace="true" />
         <!-- As above. -->
         <RegExpr attribute="DdocCode" context="#stay" String="[^-]-{3,}" />
-        <RegExpr attribute="Comment" context="#pop" String="-{3,}($|\s)" />
+        <RegExpr attribute="Comment" context="#pop" String="-{3,}(?:$|\s)" />
         <IncludeRules context="##D" />
       </context>
       <context name="DdocNestedCode" attribute="DdocCode" lineEndContext="#stay">
@@ -854,7 +854,7 @@
         <DetectChar attribute="Comment" context="#stay" char="+" firstNonSpace="true" />
         <!-- As above. -->
         <RegExpr attribute="DdocCode" context="#stay" String="[^-]-{3,}" />
-        <RegExpr attribute="Comment" context="#pop" String="-{3,}($|\s)" />
+        <RegExpr attribute="Comment" context="#pop" String="-{3,}(?:$|\s)" />
         <IncludeRules context="##D" />
       </context>
     </contexts>
diff --git a/xml/djangotemplate.xml b/xml/djangotemplate.xml
--- a/xml/djangotemplate.xml
+++ b/xml/djangotemplate.xml
@@ -4,7 +4,7 @@
 	<!ENTITY name    "[A-Za-z_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="Django HTML Template" version="6" kateversion="5.0" section="Markup" extensions="*.htm;*.html" mimetype="text/html"  author="Matthew Marshall (matthew@matthewmarshall.org)" license="LGPL" priority="9">
+<language name="Django HTML Template" version="6" kateversion="5.53" section="Markup" extensions="*.htm;*.html" mimetype="text/html"  author="Matthew Marshall (matthew@matthewmarshall.org)" license="LGPL" priority="9">
 
 <!--
     Based off of the katepart html syntax highlighting by Wilbert Berendsen.
diff --git a/xml/dockerfile.xml b/xml/dockerfile.xml
--- a/xml/dockerfile.xml
+++ b/xml/dockerfile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Dockerfile syntaxfile v1.0 by James Turnbull <james@lovedthanlost.net> -->
-<language name="Dockerfile" section="Other" version="9" kateversion="3.4" extensions="Dockerfile" author="James Turnbull (james@lovedthanlost.net)" license="MIT">
+<language name="Dockerfile" section="Other" version="9" kateversion="5.0" extensions="Dockerfile" author="James Turnbull (james@lovedthanlost.net)" license="MIT">
   <highlighting>
     <list name="keywords">
       <item>ADD</item>
diff --git a/xml/doxygen.xml b/xml/doxygen.xml
--- a/xml/doxygen.xml
+++ b/xml/doxygen.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
-    <!ENTITY wordsep "([][,?;()]|\.$|\.?\s)">     <!-- things that end a TagWord -->
+    <!ENTITY wordsep "(?:[][,?;()]|\.$|\.?\s)">   <!-- things that end a TagWord -->
     <!ENTITY sl_word ".*?(?=&wordsep;)">
     <!ENTITY ml_word ".*?(?=&wordsep;|\*/)">
 ]>
diff --git a/xml/dtd.xml b/xml/dtd.xml
--- a/xml/dtd.xml
+++ b/xml/dtd.xml
@@ -3,7 +3,7 @@
   <!ENTITY nmtoken "[\-\w\d\.:_]+">
   <!ENTITY entref  "(#[0-9]+|#[xX][0-9A-Fa-f]+|&nmtoken;);">
 ]>
-<language name="DTD" version="4" kateversion="3.4" section="Markup" extensions="*.dtd" mimetype="application/xml-dtd" author="Andriy Lesyuk (s-andy@in.if.ua)" license="LGPL">
+<language name="DTD" version="4" kateversion="5.0" section="Markup" extensions="*.dtd" mimetype="application/xml-dtd" author="Andriy Lesyuk (s-andy@in.if.ua)" license="LGPL">
   <highlighting>
 
     <list name="Category">
diff --git a/xml/elixir.xml b/xml/elixir.xml
--- a/xml/elixir.xml
+++ b/xml/elixir.xml
@@ -109,14 +109,14 @@
         <RegExpr String="\b[_A-Z]+[A-Z_0-9]+\b" attribute="Global Constant" context="#stay"/>
 
         <!-- Generally a module or class name like "File", "MyModule_1", .. -->
-        <RegExpr String="\b[A-Z]+_*([0-9]|[a-z])[_a-zA-Z0-9]*\b" attribute="Constant" context="#stay"/>
+        <RegExpr String="\b[A-Z]+_*(?:[0-9]|[a-z])[_a-zA-Z0-9]*\b" attribute="Constant" context="#stay"/>
 
         <!-- Numeric values. Note that we have to allow underscores between two digits (thus the creepy regular expressions). -->
-        <RegExpr String="\b\-?0[xX]([0-9a-fA-F]|_[0-9a-fA-F])+" attribute="Hex" context="#stay"/>
-        <RegExpr String="\b\-?0[bB]([01]|_[01])+" attribute="Bin" context="#stay"/>
-        <RegExpr String="\b\-?0[1-7]([0-7]|_[0-7])*" attribute="Octal" context="#stay"/>
-        <RegExpr String="\b\-?[0-9]([0-9]|_[0-9])*\.[0-9]([0-9]|_[0-9])*([eE]\-?[1-9]([0-9]|_[0-9])*(\.[0-9]*)?)?" attribute="Float" context="#stay"/>
-        <RegExpr String="\b\-?[1-9]([0-9]|_[0-9])*\b" attribute="Dec" context="#stay"/>
+        <RegExpr String="\b\-?0[xX](?:[0-9a-fA-F]|_[0-9a-fA-F])+" attribute="Hex" context="#stay"/>
+        <RegExpr String="\b\-?0[bB](?:[01]|_[01])+" attribute="Bin" context="#stay"/>
+        <RegExpr String="\b\-?0[1-7](?:[0-7]|_[0-7])*" attribute="Octal" context="#stay"/>
+        <RegExpr String="\b\-?[0-9](?:[0-9]|_[0-9])*\.[0-9](?:[0-9]|_[0-9])*(?:[eE]\-?[1-9](?:[0-9]|_[0-9])*(?:\.[0-9]*)?)?" attribute="Float" context="#stay"/>
+        <RegExpr String="\b\-?[1-9](?:[0-9]|_[0-9])*\b" attribute="Dec" context="#stay"/>
         <Int attribute="Dec" context="#stay"/>
         <HlCChar attribute="Char" context="#stay"/>
         <DetectChar attribute="Operator" char="." context="#stay"/>
@@ -128,10 +128,10 @@
         <RegExpr String="\s!" attribute="Operator" context="#stay"/>
         <RegExpr String="/=\s" attribute="Operator" context="#stay" insensitive="0"/>
         <Detect2Chars char="%" char1="=" attribute="Operator" context="#stay"/>
-        <RegExpr String=":(@{1,2}|\$)?[a-zA-Z_][a-zA-Z0-9_]*[=?!]?" attribute="Symbol" context="#stay"/>
-        <RegExpr String="\b(@{1,2}|\$)?[a-zA-Z_][a-zA-Z0-9_]*[=?!]?:" attribute="Symbol" context="#stay"/>
+        <RegExpr String=":(?:@{1,2}|\$)?[a-zA-Z_][a-zA-Z0-9_]*[=?!]?" attribute="Symbol" context="#stay"/>
+        <RegExpr String="\b(?:@{1,2}|\$)?[a-zA-Z_][a-zA-Z0-9_]*[=?!]?:" attribute="Symbol" context="#stay"/>
         <RegExpr String=":\[\]=?" attribute="Symbol" context="#stay"/>
-        <RegExpr String="@(module)?doc\s+&quot;&quot;&quot;" attribute="Attribute" context="Documentation"/>
+        <RegExpr String="@(?:module)?doc\s+&quot;&quot;&quot;" attribute="Attribute" context="Documentation"/>
         <StringDetect String="&quot;&quot;&quot;" attribute="String" context="Triple Quoted String"/>
         <DetectChar attribute="String" char="&quot;" context="Quoted String"/>
         <DetectChar attribute="Raw String" char="'" context="Apostrophed String"/>
@@ -146,10 +146,10 @@
       </context>
       <context attribute="DocComment" lineEndContext="#stay" name="Documentation">
         <StringDetect String="&quot;&quot;&quot;" attribute="Attribute" context="#pop"/>
-        <RegExpr attribute="MarkdownHead" String="^\s*#+\s.*[#]?$"/>
-        <RegExpr attribute="MarkdownBullet" String="^\s*[\*\+\-]\s"/>
-        <RegExpr attribute="MarkdownNumlist" String="^\s*[\d]+\.\s"/>
-        <RegExpr attribute="MarkdownCode" context="Markdown Code" String="^\s*\`\`\`\s*$"/>
+        <RegExpr attribute="MarkdownHead" String="^\s*#+\s.*[#]?$" column="0"/>
+        <RegExpr attribute="MarkdownBullet" String="^\s*[\*\+\-]\s" column="0"/>
+        <RegExpr attribute="MarkdownNumlist" String="^\s*[\d]+\.\s" column="0"/>
+        <RegExpr attribute="MarkdownCode" context="Markdown Code" String="^\s*\`\`\`\s*$" column="0"/>
         <DetectSpaces />
         <IncludeRules context="Normal Text##Markdown"/>
       </context>
@@ -184,7 +184,7 @@
         <IncludeRules context="##Comments"/>
       </context>
       <context attribute="MarkdownCode" lineEndContext="#stay" name="Markdown Code">
-        <RegExpr String="^\s*\`\`\`\s*$" attribute="MarkdownCode" context="#pop"/>
+        <RegExpr String="^\s*```\s*$" attribute="MarkdownCode" context="#pop" column="0"/>
       </context>
     </contexts>
     <itemDatas>
diff --git a/xml/graphql.xml b/xml/graphql.xml
--- a/xml/graphql.xml
+++ b/xml/graphql.xml
@@ -5,7 +5,7 @@
   Synatx: https://github.com/graphql/graphql-spec/blob/master/spec/Section%202%20- -%20Language.md
      and: https://github.com/graphql/graphql-spec/blob/master/spec/Appendix%20B%20- -%20Grammar%20Summary.md
 -->
-<language name="GraphQL" section="Other" version="3" kateversion="2.4" extensions="*.graphql" author="Volker Krause (vkrause@kde.org)" license="MIT">
+<language name="GraphQL" section="Other" version="3" kateversion="5.0" extensions="*.graphql" author="Volker Krause (vkrause@kde.org)" license="MIT">
   <highlighting>
     <list name="listKeywords">
       <item>enum</item>
diff --git a/xml/groovy.xml b/xml/groovy.xml
--- a/xml/groovy.xml
+++ b/xml/groovy.xml
@@ -1,3884 +1,240 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<!--
-    Based on the java syntax file 1.19 by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)
--->
-<language name="Groovy" version="9" kateversion="5.0" section="Sources" extensions="*.groovy;*.gradle;*.gvy;Jenkinsfile" license="LGPL" author="Chris Reeves (chris@ev-soft.net)">
-	<highlighting>
-		<list name="java15">
-			<item>ACTIVE</item>
-			<item>ACTIVITY_COMPLETED</item>
-			<item>ACTIVITY_REQUIRED</item>
-			<item>ARG_IN</item>
-			<item>ARG_INOUT</item>
-			<item>ARG_OUT</item>
-			<item>AWTError</item>
-			<item>AWTEvent</item>
-			<item>AWTEventListener</item>
-			<item>AWTEventListenerProxy</item>
-			<item>AWTEventMulticaster</item>
-			<item>AWTException</item>
-			<item>AWTKeyStroke</item>
-			<item>AWTPermission</item>
-			<item>AbstractAction</item>
-			<item>AbstractBorder</item>
-			<item>AbstractButton</item>
-			<item>AbstractCellEditor</item>
-			<item>AbstractCollection</item>
-			<item>AbstractColorChooserPanel</item>
-			<item>AbstractDocument</item>
-			<item>AbstractDocument.AttributeContext</item>
-			<item>AbstractDocument.Content</item>
-			<item>AbstractDocument.ElementEdit</item>
-			<item>AbstractExecutorService</item>
-			<item>AbstractInterruptibleChannel</item>
-			<item>AbstractLayoutCache</item>
-			<item>AbstractLayoutCache.NodeDimensions</item>
-			<item>AbstractList</item>
-			<item>AbstractListModel</item>
-			<item>AbstractMap</item>
-			<item>AbstractMethodError</item>
-			<item>AbstractPreferences</item>
-			<item>AbstractQueue</item>
-			<item>AbstractQueuedSynchronizer</item>
-			<item>AbstractSelectableChannel</item>
-			<item>AbstractSelectionKey</item>
-			<item>AbstractSelector</item>
-			<item>AbstractSequentialList</item>
-			<item>AbstractSet</item>
-			<item>AbstractSpinnerModel</item>
-			<item>AbstractTableModel</item>
-			<item>AbstractUndoableEdit</item>
-			<item>AbstractWriter</item>
-			<item>AccessControlContext</item>
-			<item>AccessControlException</item>
-			<item>AccessController</item>
-			<item>AccessException</item>
-			<item>Accessible</item>
-			<item>AccessibleAction</item>
-			<item>AccessibleAttributeSequence</item>
-			<item>AccessibleBundle</item>
-			<item>AccessibleComponent</item>
-			<item>AccessibleContext</item>
-			<item>AccessibleEditableText</item>
-			<item>AccessibleExtendedComponent</item>
-			<item>AccessibleExtendedTable</item>
-			<item>AccessibleExtendedText</item>
-			<item>AccessibleHyperlink</item>
-			<item>AccessibleHypertext</item>
-			<item>AccessibleIcon</item>
-			<item>AccessibleKeyBinding</item>
-			<item>AccessibleObject</item>
-			<item>AccessibleRelation</item>
-			<item>AccessibleRelationSet</item>
-			<item>AccessibleResourceBundle</item>
-			<item>AccessibleRole</item>
-			<item>AccessibleSelection</item>
-			<item>AccessibleState</item>
-			<item>AccessibleStateSet</item>
-			<item>AccessibleStreamable</item>
-			<item>AccessibleTable</item>
-			<item>AccessibleTableModelChange</item>
-			<item>AccessibleText</item>
-			<item>AccessibleTextSequence</item>
-			<item>AccessibleValue</item>
-			<item>AccountException</item>
-			<item>AccountExpiredException</item>
-			<item>AccountLockedException</item>
-			<item>AccountNotFoundException</item>
-			<item>Acl</item>
-			<item>AclEntry</item>
-			<item>AclNotFoundException</item>
-			<item>Action</item>
-			<item>ActionEvent</item>
-			<item>ActionListener</item>
-			<item>ActionMap</item>
-			<item>ActionMapUIResource</item>
-			<item>Activatable</item>
-			<item>ActivateFailedException</item>
-			<item>ActivationDesc</item>
-			<item>ActivationException</item>
-			<item>ActivationGroup</item>
-			<item>ActivationGroupDesc</item>
-			<item>ActivationGroupDesc.CommandEnvironment</item>
-			<item>ActivationGroupID</item>
-			<item>ActivationGroup_Stub</item>
-			<item>ActivationID</item>
-			<item>ActivationInstantiator</item>
-			<item>ActivationMonitor</item>
-			<item>ActivationSystem</item>
-			<item>Activator</item>
-			<item>ActiveEvent</item>
-			<item>ActivityCompletedException</item>
-			<item>ActivityRequiredException</item>
-			<item>AdapterActivator</item>
-			<item>AdapterActivatorOperations</item>
-			<item>AdapterAlreadyExists</item>
-			<item>AdapterAlreadyExistsHelper</item>
-			<item>AdapterInactive</item>
-			<item>AdapterInactiveHelper</item>
-			<item>AdapterManagerIdHelper</item>
-			<item>AdapterNameHelper</item>
-			<item>AdapterNonExistent</item>
-			<item>AdapterNonExistentHelper</item>
-			<item>AdapterStateHelper</item>
-			<item>AddressHelper</item>
-			<item>Adjustable</item>
-			<item>AdjustmentEvent</item>
-			<item>AdjustmentListener</item>
-			<item>Adler32</item>
-			<item>AffineTransform</item>
-			<item>AffineTransformOp</item>
-			<item>AlgorithmParameterGenerator</item>
-			<item>AlgorithmParameterGeneratorSpi</item>
-			<item>AlgorithmParameterSpec</item>
-			<item>AlgorithmParameters</item>
-			<item>AlgorithmParametersSpi</item>
-			<item>AllPermission</item>
-			<item>AlphaComposite</item>
-			<item>AlreadyBound</item>
-			<item>AlreadyBoundException</item>
-			<item>AlreadyBoundHelper</item>
-			<item>AlreadyBoundHolder</item>
-			<item>AlreadyConnectedException</item>
-			<item>AncestorEvent</item>
-			<item>AncestorListener</item>
-			<item>AnnotatedElement</item>
-			<item>Annotation</item>
-			<item>Annotation</item>
-			<item>AnnotationFormatError</item>
-			<item>AnnotationTypeMismatchException</item>
-			<item>Any</item>
-			<item>AnyHolder</item>
-			<item>AnySeqHelper</item>
-			<item>AnySeqHelper</item>
-			<item>AnySeqHolder</item>
-			<item>AppConfigurationEntry</item>
-			<item>AppConfigurationEntry.LoginModuleControlFlag</item>
-			<item>Appendable</item>
-			<item>Applet</item>
-			<item>AppletContext</item>
-			<item>AppletInitializer</item>
-			<item>AppletStub</item>
-			<item>ApplicationException</item>
-			<item>Arc2D</item>
-			<item>Arc2D.Double</item>
-			<item>Arc2D.Float</item>
-			<item>Area</item>
-			<item>AreaAveragingScaleFilter</item>
-			<item>ArithmeticException</item>
-			<item>Array</item>
-			<item>Array</item>
-			<item>ArrayBlockingQueue</item>
-			<item>ArrayIndexOutOfBoundsException</item>
-			<item>ArrayList</item>
-			<item>ArrayStoreException</item>
-			<item>ArrayType</item>
-			<item>Arrays</item>
-			<item>AssertionError</item>
-			<item>AsyncBoxView</item>
-			<item>AsynchronousCloseException</item>
-			<item>AtomicBoolean</item>
-			<item>AtomicInteger</item>
-			<item>AtomicIntegerArray</item>
-			<item>AtomicIntegerFieldUpdater</item>
-			<item>AtomicLong</item>
-			<item>AtomicLongArray</item>
-			<item>AtomicLongFieldUpdater</item>
-			<item>AtomicMarkableReference</item>
-			<item>AtomicReference</item>
-			<item>AtomicReferenceArray</item>
-			<item>AtomicReferenceFieldUpdater</item>
-			<item>AtomicStampedReference</item>
-			<item>Attr</item>
-			<item>Attribute</item>
-			<item>Attribute</item>
-			<item>Attribute</item>
-			<item>AttributeChangeNotification</item>
-			<item>AttributeChangeNotificationFilter</item>
-			<item>AttributeException</item>
-			<item>AttributeInUseException</item>
-			<item>AttributeList</item>
-			<item>AttributeList</item>
-			<item>AttributeList</item>
-			<item>AttributeListImpl</item>
-			<item>AttributeModificationException</item>
-			<item>AttributeNotFoundException</item>
-			<item>AttributeSet</item>
-			<item>AttributeSet</item>
-			<item>AttributeSet.CharacterAttribute</item>
-			<item>AttributeSet.ColorAttribute</item>
-			<item>AttributeSet.FontAttribute</item>
-			<item>AttributeSet.ParagraphAttribute</item>
-			<item>AttributeSetUtilities</item>
-			<item>AttributeValueExp</item>
-			<item>AttributedCharacterIterator</item>
-			<item>AttributedCharacterIterator.Attribute</item>
-			<item>AttributedString</item>
-			<item>Attributes</item>
-			<item>Attributes</item>
-			<item>Attributes</item>
-			<item>Attributes.Name</item>
-			<item>Attributes2</item>
-			<item>Attributes2Impl</item>
-			<item>AttributesImpl</item>
-			<item>AudioClip</item>
-			<item>AudioFileFormat</item>
-			<item>AudioFileFormat.Type</item>
-			<item>AudioFileReader</item>
-			<item>AudioFileWriter</item>
-			<item>AudioFormat</item>
-			<item>AudioFormat.Encoding</item>
-			<item>AudioInputStream</item>
-			<item>AudioPermission</item>
-			<item>AudioSystem</item>
-			<item>AuthPermission</item>
-			<item>AuthProvider</item>
-			<item>AuthenticationException</item>
-			<item>AuthenticationException</item>
-			<item>AuthenticationNotSupportedException</item>
-			<item>Authenticator</item>
-			<item>Authenticator.RequestorType</item>
-			<item>AuthorizeCallback</item>
-			<item>Autoscroll</item>
-			<item>BAD_CONTEXT</item>
-			<item>BAD_INV_ORDER</item>
-			<item>BAD_OPERATION</item>
-			<item>BAD_PARAM</item>
-			<item>BAD_POLICY</item>
-			<item>BAD_POLICY_TYPE</item>
-			<item>BAD_POLICY_VALUE</item>
-			<item>BAD_QOS</item>
-			<item>BAD_TYPECODE</item>
-			<item>BMPImageWriteParam</item>
-			<item>BackingStoreException</item>
-			<item>BadAttributeValueExpException</item>
-			<item>BadBinaryOpValueExpException</item>
-			<item>BadKind</item>
-			<item>BadLocationException</item>
-			<item>BadPaddingException</item>
-			<item>BadStringOperationException</item>
-			<item>BandCombineOp</item>
-			<item>BandedSampleModel</item>
-			<item>BaseRowSet</item>
-			<item>BasicArrowButton</item>
-			<item>BasicAttribute</item>
-			<item>BasicAttributes</item>
-			<item>BasicBorders</item>
-			<item>BasicBorders.ButtonBorder</item>
-			<item>BasicBorders.FieldBorder</item>
-			<item>BasicBorders.MarginBorder</item>
-			<item>BasicBorders.MenuBarBorder</item>
-			<item>BasicBorders.RadioButtonBorder</item>
-			<item>BasicBorders.RolloverButtonBorder</item>
-			<item>BasicBorders.SplitPaneBorder</item>
-			<item>BasicBorders.ToggleButtonBorder</item>
-			<item>BasicButtonListener</item>
-			<item>BasicButtonUI</item>
-			<item>BasicCheckBoxMenuItemUI</item>
-			<item>BasicCheckBoxUI</item>
-			<item>BasicColorChooserUI</item>
-			<item>BasicComboBoxEditor</item>
-			<item>BasicComboBoxEditor.UIResource</item>
-			<item>BasicComboBoxRenderer</item>
-			<item>BasicComboBoxRenderer.UIResource</item>
-			<item>BasicComboBoxUI</item>
-			<item>BasicComboPopup</item>
-			<item>BasicControl</item>
-			<item>BasicDesktopIconUI</item>
-			<item>BasicDesktopPaneUI</item>
-			<item>BasicDirectoryModel</item>
-			<item>BasicEditorPaneUI</item>
-			<item>BasicFileChooserUI</item>
-			<item>BasicFormattedTextFieldUI</item>
-			<item>BasicGraphicsUtils</item>
-			<item>BasicHTML</item>
-			<item>BasicIconFactory</item>
-			<item>BasicInternalFrameTitlePane</item>
-			<item>BasicInternalFrameUI</item>
-			<item>BasicLabelUI</item>
-			<item>BasicListUI</item>
-			<item>BasicLookAndFeel</item>
-			<item>BasicMenuBarUI</item>
-			<item>BasicMenuItemUI</item>
-			<item>BasicMenuUI</item>
-			<item>BasicOptionPaneUI</item>
-			<item>BasicOptionPaneUI.ButtonAreaLayout</item>
-			<item>BasicPanelUI</item>
-			<item>BasicPasswordFieldUI</item>
-			<item>BasicPermission</item>
-			<item>BasicPopupMenuSeparatorUI</item>
-			<item>BasicPopupMenuUI</item>
-			<item>BasicProgressBarUI</item>
-			<item>BasicRadioButtonMenuItemUI</item>
-			<item>BasicRadioButtonUI</item>
-			<item>BasicRootPaneUI</item>
-			<item>BasicScrollBarUI</item>
-			<item>BasicScrollPaneUI</item>
-			<item>BasicSeparatorUI</item>
-			<item>BasicSliderUI</item>
-			<item>BasicSpinnerUI</item>
-			<item>BasicSplitPaneDivider</item>
-			<item>BasicSplitPaneUI</item>
-			<item>BasicStroke</item>
-			<item>BasicTabbedPaneUI</item>
-			<item>BasicTableHeaderUI</item>
-			<item>BasicTableUI</item>
-			<item>BasicTextAreaUI</item>
-			<item>BasicTextFieldUI</item>
-			<item>BasicTextPaneUI</item>
-			<item>BasicTextUI</item>
-			<item>BasicTextUI.BasicCaret</item>
-			<item>BasicTextUI.BasicHighlighter</item>
-			<item>BasicToggleButtonUI</item>
-			<item>BasicToolBarSeparatorUI</item>
-			<item>BasicToolBarUI</item>
-			<item>BasicToolTipUI</item>
-			<item>BasicTreeUI</item>
-			<item>BasicViewportUI</item>
-			<item>BatchUpdateException</item>
-			<item>BeanContext</item>
-			<item>BeanContextChild</item>
-			<item>BeanContextChildComponentProxy</item>
-			<item>BeanContextChildSupport</item>
-			<item>BeanContextContainerProxy</item>
-			<item>BeanContextEvent</item>
-			<item>BeanContextMembershipEvent</item>
-			<item>BeanContextMembershipListener</item>
-			<item>BeanContextProxy</item>
-			<item>BeanContextServiceAvailableEvent</item>
-			<item>BeanContextServiceProvider</item>
-			<item>BeanContextServiceProviderBeanInfo</item>
-			<item>BeanContextServiceRevokedEvent</item>
-			<item>BeanContextServiceRevokedListener</item>
-			<item>BeanContextServices</item>
-			<item>BeanContextServicesListener</item>
-			<item>BeanContextServicesSupport</item>
-			<item>BeanContextServicesSupport.BCSSServiceProvider</item>
-			<item>BeanContextSupport</item>
-			<item>BeanContextSupport.BCSIterator</item>
-			<item>BeanDescriptor</item>
-			<item>BeanInfo</item>
-			<item>Beans</item>
-			<item>BevelBorder</item>
-			<item>Bidi</item>
-			<item>BigDecimal</item>
-			<item>BigInteger</item>
-			<item>BinaryRefAddr</item>
-			<item>BindException</item>
-			<item>Binding</item>
-			<item>Binding</item>
-			<item>BindingHelper</item>
-			<item>BindingHolder</item>
-			<item>BindingIterator</item>
-			<item>BindingIteratorHelper</item>
-			<item>BindingIteratorHolder</item>
-			<item>BindingIteratorOperations</item>
-			<item>BindingIteratorPOA</item>
-			<item>BindingListHelper</item>
-			<item>BindingListHolder</item>
-			<item>BindingType</item>
-			<item>BindingTypeHelper</item>
-			<item>BindingTypeHolder</item>
-			<item>BitSet</item>
-			<item>Blob</item>
-			<item>BlockView</item>
-			<item>BlockingQueue</item>
-			<item>Book</item>
-			<item>Boolean</item>
-			<item>BooleanControl</item>
-			<item>BooleanControl.Type</item>
-			<item>BooleanHolder</item>
-			<item>BooleanSeqHelper</item>
-			<item>BooleanSeqHolder</item>
-			<item>Border</item>
-			<item>BorderFactory</item>
-			<item>BorderLayout</item>
-			<item>BorderUIResource</item>
-			<item>BorderUIResource.BevelBorderUIResource</item>
-			<item>BorderUIResource.CompoundBorderUIResource</item>
-			<item>BorderUIResource.EmptyBorderUIResource</item>
-			<item>BorderUIResource.EtchedBorderUIResource</item>
-			<item>BorderUIResource.LineBorderUIResource</item>
-			<item>BorderUIResource.MatteBorderUIResource</item>
-			<item>BorderUIResource.TitledBorderUIResource</item>
-			<item>BoundedRangeModel</item>
-			<item>Bounds</item>
-			<item>Bounds</item>
-			<item>Box</item>
-			<item>Box.Filler</item>
-			<item>BoxLayout</item>
-			<item>BoxView</item>
-			<item>BoxedValueHelper</item>
-			<item>BreakIterator</item>
-			<item>BrokenBarrierException</item>
-			<item>Buffer</item>
-			<item>BufferCapabilities</item>
-			<item>BufferCapabilities.FlipContents</item>
-			<item>BufferOverflowException</item>
-			<item>BufferStrategy</item>
-			<item>BufferUnderflowException</item>
-			<item>BufferedImage</item>
-			<item>BufferedImageFilter</item>
-			<item>BufferedImageOp</item>
-			<item>BufferedInputStream</item>
-			<item>BufferedOutputStream</item>
-			<item>BufferedReader</item>
-			<item>BufferedWriter</item>
-			<item>Button</item>
-			<item>ButtonGroup</item>
-			<item>ButtonModel</item>
-			<item>ButtonUI</item>
-			<item>Byte</item>
-			<item>ByteArrayInputStream</item>
-			<item>ByteArrayOutputStream</item>
-			<item>ByteBuffer</item>
-			<item>ByteChannel</item>
-			<item>ByteHolder</item>
-			<item>ByteLookupTable</item>
-			<item>ByteOrder</item>
-			<item>CDATASection</item>
-			<item>CMMException</item>
-			<item>CODESET_INCOMPATIBLE</item>
-			<item>COMM_FAILURE</item>
-			<item>CRC32</item>
-			<item>CRL</item>
-			<item>CRLException</item>
-			<item>CRLSelector</item>
-			<item>CSS</item>
-			<item>CSS.Attribute</item>
-			<item>CTX_RESTRICT_SCOPE</item>
-			<item>CacheRequest</item>
-			<item>CacheResponse</item>
-			<item>CachedRowSet</item>
-			<item>Calendar</item>
-			<item>Callable</item>
-			<item>CallableStatement</item>
-			<item>Callback</item>
-			<item>CallbackHandler</item>
-			<item>CancelablePrintJob</item>
-			<item>CancellationException</item>
-			<item>CancelledKeyException</item>
-			<item>CannotProceed</item>
-			<item>CannotProceedException</item>
-			<item>CannotProceedHelper</item>
-			<item>CannotProceedHolder</item>
-			<item>CannotRedoException</item>
-			<item>CannotUndoException</item>
-			<item>Canvas</item>
-			<item>CardLayout</item>
-			<item>Caret</item>
-			<item>CaretEvent</item>
-			<item>CaretListener</item>
-			<item>CellEditor</item>
-			<item>CellEditorListener</item>
-			<item>CellRendererPane</item>
-			<item>CertPath</item>
-			<item>CertPath.CertPathRep</item>
-			<item>CertPathBuilder</item>
-			<item>CertPathBuilderException</item>
-			<item>CertPathBuilderResult</item>
-			<item>CertPathBuilderSpi</item>
-			<item>CertPathParameters</item>
-			<item>CertPathTrustManagerParameters</item>
-			<item>CertPathValidator</item>
-			<item>CertPathValidatorException</item>
-			<item>CertPathValidatorResult</item>
-			<item>CertPathValidatorSpi</item>
-			<item>CertSelector</item>
-			<item>CertStore</item>
-			<item>CertStoreException</item>
-			<item>CertStoreParameters</item>
-			<item>CertStoreSpi</item>
-			<item>Certificate</item>
-			<item>Certificate</item>
-			<item>Certificate</item>
-			<item>Certificate.CertificateRep</item>
-			<item>CertificateEncodingException</item>
-			<item>CertificateEncodingException</item>
-			<item>CertificateException</item>
-			<item>CertificateException</item>
-			<item>CertificateExpiredException</item>
-			<item>CertificateExpiredException</item>
-			<item>CertificateFactory</item>
-			<item>CertificateFactorySpi</item>
-			<item>CertificateNotYetValidException</item>
-			<item>CertificateNotYetValidException</item>
-			<item>CertificateParsingException</item>
-			<item>CertificateParsingException</item>
-			<item>ChangeEvent</item>
-			<item>ChangeListener</item>
-			<item>ChangedCharSetException</item>
-			<item>Channel</item>
-			<item>ChannelBinding</item>
-			<item>Channels</item>
-			<item>CharArrayReader</item>
-			<item>CharArrayWriter</item>
-			<item>CharBuffer</item>
-			<item>CharConversionException</item>
-			<item>CharHolder</item>
-			<item>CharSeqHelper</item>
-			<item>CharSeqHolder</item>
-			<item>CharSequence</item>
-			<item>Character</item>
-			<item>Character.Subset</item>
-			<item>Character.UnicodeBlock</item>
-			<item>CharacterCodingException</item>
-			<item>CharacterData</item>
-			<item>CharacterIterator</item>
-			<item>Charset</item>
-			<item>CharsetDecoder</item>
-			<item>CharsetEncoder</item>
-			<item>CharsetProvider</item>
-			<item>Checkbox</item>
-			<item>CheckboxGroup</item>
-			<item>CheckboxMenuItem</item>
-			<item>CheckedInputStream</item>
-			<item>CheckedOutputStream</item>
-			<item>Checksum</item>
-			<item>Choice</item>
-			<item>ChoiceCallback</item>
-			<item>ChoiceFormat</item>
-			<item>Chromaticity</item>
-			<item>Cipher</item>
-			<item>CipherInputStream</item>
-			<item>CipherOutputStream</item>
-			<item>CipherSpi</item>
-			<item>Class</item>
-			<item>ClassCastException</item>
-			<item>ClassCircularityError</item>
-			<item>ClassDefinition</item>
-			<item>ClassDesc</item>
-			<item>ClassFileTransformer</item>
-			<item>ClassFormatError</item>
-			<item>ClassLoader</item>
-			<item>ClassLoaderRepository</item>
-			<item>ClassLoadingMXBean</item>
-			<item>ClassNotFoundException</item>
-			<item>ClientRequestInfo</item>
-			<item>ClientRequestInfoOperations</item>
-			<item>ClientRequestInterceptor</item>
-			<item>ClientRequestInterceptorOperations</item>
-			<item>Clip</item>
-			<item>Clipboard</item>
-			<item>ClipboardOwner</item>
-			<item>Clob</item>
-			<item>CloneNotSupportedException</item>
-			<item>Cloneable</item>
-			<item>Closeable</item>
-			<item>ClosedByInterruptException</item>
-			<item>ClosedChannelException</item>
-			<item>ClosedSelectorException</item>
-			<item>CodeSets</item>
-			<item>CodeSigner</item>
-			<item>CodeSource</item>
-			<item>Codec</item>
-			<item>CodecFactory</item>
-			<item>CodecFactoryHelper</item>
-			<item>CodecFactoryOperations</item>
-			<item>CodecOperations</item>
-			<item>CoderMalfunctionError</item>
-			<item>CoderResult</item>
-			<item>CodingErrorAction</item>
-			<item>CollationElementIterator</item>
-			<item>CollationKey</item>
-			<item>Collator</item>
-			<item>Collection</item>
-			<item>CollectionCertStoreParameters</item>
-			<item>Collections</item>
-			<item>Color</item>
-			<item>ColorChooserComponentFactory</item>
-			<item>ColorChooserUI</item>
-			<item>ColorConvertOp</item>
-			<item>ColorModel</item>
-			<item>ColorSelectionModel</item>
-			<item>ColorSpace</item>
-			<item>ColorSupported</item>
-			<item>ColorType</item>
-			<item>ColorUIResource</item>
-			<item>ComboBoxEditor</item>
-			<item>ComboBoxModel</item>
-			<item>ComboBoxUI</item>
-			<item>ComboPopup</item>
-			<item>Comment</item>
-			<item>CommunicationException</item>
-			<item>Comparable</item>
-			<item>Comparator</item>
-			<item>CompilationMXBean</item>
-			<item>Compiler</item>
-			<item>CompletionService</item>
-			<item>CompletionStatus</item>
-			<item>CompletionStatusHelper</item>
-			<item>Component</item>
-			<item>ComponentAdapter</item>
-			<item>ComponentColorModel</item>
-			<item>ComponentEvent</item>
-			<item>ComponentIdHelper</item>
-			<item>ComponentInputMap</item>
-			<item>ComponentInputMapUIResource</item>
-			<item>ComponentListener</item>
-			<item>ComponentOrientation</item>
-			<item>ComponentSampleModel</item>
-			<item>ComponentUI</item>
-			<item>ComponentView</item>
-			<item>Composite</item>
-			<item>CompositeContext</item>
-			<item>CompositeData</item>
-			<item>CompositeDataSupport</item>
-			<item>CompositeName</item>
-			<item>CompositeType</item>
-			<item>CompositeView</item>
-			<item>CompoundBorder</item>
-			<item>CompoundControl</item>
-			<item>CompoundControl.Type</item>
-			<item>CompoundEdit</item>
-			<item>CompoundName</item>
-			<item>Compression</item>
-			<item>ConcurrentHashMap</item>
-			<item>ConcurrentLinkedQueue</item>
-			<item>ConcurrentMap</item>
-			<item>ConcurrentModificationException</item>
-			<item>Condition</item>
-			<item>Configuration</item>
-			<item>ConfigurationException</item>
-			<item>ConfirmationCallback</item>
-			<item>ConnectException</item>
-			<item>ConnectException</item>
-			<item>ConnectIOException</item>
-			<item>Connection</item>
-			<item>ConnectionEvent</item>
-			<item>ConnectionEventListener</item>
-			<item>ConnectionPendingException</item>
-			<item>ConnectionPoolDataSource</item>
-			<item>ConsoleHandler</item>
-			<item>Constructor</item>
-			<item>Container</item>
-			<item>ContainerAdapter</item>
-			<item>ContainerEvent</item>
-			<item>ContainerListener</item>
-			<item>ContainerOrderFocusTraversalPolicy</item>
-			<item>ContentHandler</item>
-			<item>ContentHandler</item>
-			<item>ContentHandlerFactory</item>
-			<item>ContentModel</item>
-			<item>Context</item>
-			<item>Context</item>
-			<item>ContextList</item>
-			<item>ContextNotEmptyException</item>
-			<item>ContextualRenderedImageFactory</item>
-			<item>Control</item>
-			<item>Control</item>
-			<item>Control.Type</item>
-			<item>ControlFactory</item>
-			<item>ControllerEventListener</item>
-			<item>ConvolveOp</item>
-			<item>CookieHandler</item>
-			<item>CookieHolder</item>
-			<item>Copies</item>
-			<item>CopiesSupported</item>
-			<item>CopyOnWriteArrayList</item>
-			<item>CopyOnWriteArraySet</item>
-			<item>CountDownLatch</item>
-			<item>CounterMonitor</item>
-			<item>CounterMonitorMBean</item>
-			<item>CredentialException</item>
-			<item>CredentialExpiredException</item>
-			<item>CredentialNotFoundException</item>
-			<item>CropImageFilter</item>
-			<item>CubicCurve2D</item>
-			<item>CubicCurve2D.Double</item>
-			<item>CubicCurve2D.Float</item>
-			<item>Currency</item>
-			<item>Current</item>
-			<item>Current</item>
-			<item>Current</item>
-			<item>CurrentHelper</item>
-			<item>CurrentHelper</item>
-			<item>CurrentHelper</item>
-			<item>CurrentHolder</item>
-			<item>CurrentOperations</item>
-			<item>CurrentOperations</item>
-			<item>CurrentOperations</item>
-			<item>Cursor</item>
-			<item>CustomMarshal</item>
-			<item>CustomValue</item>
-			<item>Customizer</item>
-			<item>CyclicBarrier</item>
-			<item>DATA_CONVERSION</item>
-			<item>DESKeySpec</item>
-			<item>DESedeKeySpec</item>
-			<item>DGC</item>
-			<item>DHGenParameterSpec</item>
-			<item>DHKey</item>
-			<item>DHParameterSpec</item>
-			<item>DHPrivateKey</item>
-			<item>DHPrivateKeySpec</item>
-			<item>DHPublicKey</item>
-			<item>DHPublicKeySpec</item>
-			<item>DISCARDING</item>
-			<item>DOMConfiguration</item>
-			<item>DOMError</item>
-			<item>DOMErrorHandler</item>
-			<item>DOMException</item>
-			<item>DOMImplementation</item>
-			<item>DOMImplementationLS</item>
-			<item>DOMImplementationList</item>
-			<item>DOMImplementationRegistry</item>
-			<item>DOMImplementationSource</item>
-			<item>DOMLocator</item>
-			<item>DOMLocator</item>
-			<item>DOMResult</item>
-			<item>DOMSource</item>
-			<item>DOMStringList</item>
-			<item>DSAKey</item>
-			<item>DSAKeyPairGenerator</item>
-			<item>DSAParameterSpec</item>
-			<item>DSAParams</item>
-			<item>DSAPrivateKey</item>
-			<item>DSAPrivateKeySpec</item>
-			<item>DSAPublicKey</item>
-			<item>DSAPublicKeySpec</item>
-			<item>DTD</item>
-			<item>DTDConstants</item>
-			<item>DTDHandler</item>
-			<item>DataBuffer</item>
-			<item>DataBufferByte</item>
-			<item>DataBufferDouble</item>
-			<item>DataBufferFloat</item>
-			<item>DataBufferInt</item>
-			<item>DataBufferShort</item>
-			<item>DataBufferUShort</item>
-			<item>DataFlavor</item>
-			<item>DataFormatException</item>
-			<item>DataInput</item>
-			<item>DataInputStream</item>
-			<item>DataInputStream</item>
-			<item>DataLine</item>
-			<item>DataLine.Info</item>
-			<item>DataOutput</item>
-			<item>DataOutputStream</item>
-			<item>DataOutputStream</item>
-			<item>DataSource</item>
-			<item>DataTruncation</item>
-			<item>DatabaseMetaData</item>
-			<item>DatagramChannel</item>
-			<item>DatagramPacket</item>
-			<item>DatagramSocket</item>
-			<item>DatagramSocketImpl</item>
-			<item>DatagramSocketImplFactory</item>
-			<item>DatatypeConfigurationException</item>
-			<item>DatatypeConstants</item>
-			<item>DatatypeConstants.Field</item>
-			<item>DatatypeFactory</item>
-			<item>Date</item>
-			<item>Date</item>
-			<item>DateFormat</item>
-			<item>DateFormat.Field</item>
-			<item>DateFormatSymbols</item>
-			<item>DateFormatter</item>
-			<item>DateTimeAtCompleted</item>
-			<item>DateTimeAtCreation</item>
-			<item>DateTimeAtProcessing</item>
-			<item>DateTimeSyntax</item>
-			<item>DebugGraphics</item>
-			<item>DecimalFormat</item>
-			<item>DecimalFormatSymbols</item>
-			<item>DeclHandler</item>
-			<item>DefaultBoundedRangeModel</item>
-			<item>DefaultButtonModel</item>
-			<item>DefaultCaret</item>
-			<item>DefaultCellEditor</item>
-			<item>DefaultColorSelectionModel</item>
-			<item>DefaultComboBoxModel</item>
-			<item>DefaultDesktopManager</item>
-			<item>DefaultEditorKit</item>
-			<item>DefaultEditorKit.BeepAction</item>
-			<item>DefaultEditorKit.CopyAction</item>
-			<item>DefaultEditorKit.CutAction</item>
-			<item>DefaultEditorKit.DefaultKeyTypedAction</item>
-			<item>DefaultEditorKit.InsertBreakAction</item>
-			<item>DefaultEditorKit.InsertContentAction</item>
-			<item>DefaultEditorKit.InsertTabAction</item>
-			<item>DefaultEditorKit.PasteAction</item>
-			<item>DefaultFocusManager</item>
-			<item>DefaultFocusTraversalPolicy</item>
-			<item>DefaultFormatter</item>
-			<item>DefaultFormatterFactory</item>
-			<item>DefaultHandler</item>
-			<item>DefaultHandler2</item>
-			<item>DefaultHighlighter</item>
-			<item>DefaultHighlighter.DefaultHighlightPainter</item>
-			<item>DefaultKeyboardFocusManager</item>
-			<item>DefaultListCellRenderer</item>
-			<item>DefaultListCellRenderer.UIResource</item>
-			<item>DefaultListModel</item>
-			<item>DefaultListSelectionModel</item>
-			<item>DefaultLoaderRepository</item>
-			<item>DefaultLoaderRepository</item>
-			<item>DefaultMenuLayout</item>
-			<item>DefaultMetalTheme</item>
-			<item>DefaultMutableTreeNode</item>
-			<item>DefaultPersistenceDelegate</item>
-			<item>DefaultSingleSelectionModel</item>
-			<item>DefaultStyledDocument</item>
-			<item>DefaultStyledDocument.AttributeUndoableEdit</item>
-			<item>DefaultStyledDocument.ElementSpec</item>
-			<item>DefaultTableCellRenderer</item>
-			<item>DefaultTableCellRenderer.UIResource</item>
-			<item>DefaultTableColumnModel</item>
-			<item>DefaultTableModel</item>
-			<item>DefaultTextUI</item>
-			<item>DefaultTreeCellEditor</item>
-			<item>DefaultTreeCellRenderer</item>
-			<item>DefaultTreeModel</item>
-			<item>DefaultTreeSelectionModel</item>
-			<item>DefinitionKind</item>
-			<item>DefinitionKindHelper</item>
-			<item>Deflater</item>
-			<item>DeflaterOutputStream</item>
-			<item>DelayQueue</item>
-			<item>Delayed</item>
-			<item>Delegate</item>
-			<item>Delegate</item>
-			<item>Delegate</item>
-			<item>DelegationPermission</item>
-			<item>Deprecated</item>
-			<item>Descriptor</item>
-			<item>DescriptorAccess</item>
-			<item>DescriptorSupport</item>
-			<item>DesignMode</item>
-			<item>DesktopIconUI</item>
-			<item>DesktopManager</item>
-			<item>DesktopPaneUI</item>
-			<item>Destination</item>
-			<item>DestroyFailedException</item>
-			<item>Destroyable</item>
-			<item>Dialog</item>
-			<item>Dictionary</item>
-			<item>DigestException</item>
-			<item>DigestInputStream</item>
-			<item>DigestOutputStream</item>
-			<item>Dimension</item>
-			<item>Dimension2D</item>
-			<item>DimensionUIResource</item>
-			<item>DirContext</item>
-			<item>DirObjectFactory</item>
-			<item>DirStateFactory</item>
-			<item>DirStateFactory.Result</item>
-			<item>DirectColorModel</item>
-			<item>DirectoryManager</item>
-			<item>DisplayMode</item>
-			<item>DnDConstants</item>
-			<item>Doc</item>
-			<item>DocAttribute</item>
-			<item>DocAttributeSet</item>
-			<item>DocFlavor</item>
-			<item>DocFlavor.BYTE_ARRAY</item>
-			<item>DocFlavor.CHAR_ARRAY</item>
-			<item>DocFlavor.INPUT_STREAM</item>
-			<item>DocFlavor.READER</item>
-			<item>DocFlavor.SERVICE_FORMATTED</item>
-			<item>DocFlavor.STRING</item>
-			<item>DocFlavor.URL</item>
-			<item>DocPrintJob</item>
-			<item>Document</item>
-			<item>Document</item>
-			<item>DocumentBuilder</item>
-			<item>DocumentBuilderFactory</item>
-			<item>DocumentEvent</item>
-			<item>DocumentEvent.ElementChange</item>
-			<item>DocumentEvent.EventType</item>
-			<item>DocumentFilter</item>
-			<item>DocumentFilter.FilterBypass</item>
-			<item>DocumentFragment</item>
-			<item>DocumentHandler</item>
-			<item>DocumentListener</item>
-			<item>DocumentName</item>
-			<item>DocumentParser</item>
-			<item>DocumentType</item>
-			<item>Documented</item>
-			<item>DomainCombiner</item>
-			<item>DomainManager</item>
-			<item>DomainManagerOperations</item>
-			<item>Double</item>
-			<item>DoubleBuffer</item>
-			<item>DoubleHolder</item>
-			<item>DoubleSeqHelper</item>
-			<item>DoubleSeqHolder</item>
-			<item>DragGestureEvent</item>
-			<item>DragGestureListener</item>
-			<item>DragGestureRecognizer</item>
-			<item>DragSource</item>
-			<item>DragSourceAdapter</item>
-			<item>DragSourceContext</item>
-			<item>DragSourceDragEvent</item>
-			<item>DragSourceDropEvent</item>
-			<item>DragSourceEvent</item>
-			<item>DragSourceListener</item>
-			<item>DragSourceMotionListener</item>
-			<item>Driver</item>
-			<item>DriverManager</item>
-			<item>DriverPropertyInfo</item>
-			<item>DropTarget</item>
-			<item>DropTarget.DropTargetAutoScroller</item>
-			<item>DropTargetAdapter</item>
-			<item>DropTargetContext</item>
-			<item>DropTargetDragEvent</item>
-			<item>DropTargetDropEvent</item>
-			<item>DropTargetEvent</item>
-			<item>DropTargetListener</item>
-			<item>DuplicateFormatFlagsException</item>
-			<item>DuplicateName</item>
-			<item>DuplicateNameHelper</item>
-			<item>Duration</item>
-			<item>DynAny</item>
-			<item>DynAny</item>
-			<item>DynAnyFactory</item>
-			<item>DynAnyFactoryHelper</item>
-			<item>DynAnyFactoryOperations</item>
-			<item>DynAnyHelper</item>
-			<item>DynAnyOperations</item>
-			<item>DynAnySeqHelper</item>
-			<item>DynArray</item>
-			<item>DynArray</item>
-			<item>DynArrayHelper</item>
-			<item>DynArrayOperations</item>
-			<item>DynEnum</item>
-			<item>DynEnum</item>
-			<item>DynEnumHelper</item>
-			<item>DynEnumOperations</item>
-			<item>DynFixed</item>
-			<item>DynFixed</item>
-			<item>DynFixedHelper</item>
-			<item>DynFixedOperations</item>
-			<item>DynSequence</item>
-			<item>DynSequence</item>
-			<item>DynSequenceHelper</item>
-			<item>DynSequenceOperations</item>
-			<item>DynStruct</item>
-			<item>DynStruct</item>
-			<item>DynStructHelper</item>
-			<item>DynStructOperations</item>
-			<item>DynUnion</item>
-			<item>DynUnion</item>
-			<item>DynUnionHelper</item>
-			<item>DynUnionOperations</item>
-			<item>DynValue</item>
-			<item>DynValue</item>
-			<item>DynValueBox</item>
-			<item>DynValueBoxOperations</item>
-			<item>DynValueCommon</item>
-			<item>DynValueCommonOperations</item>
-			<item>DynValueHelper</item>
-			<item>DynValueOperations</item>
-			<item>DynamicImplementation</item>
-			<item>DynamicImplementation</item>
-			<item>DynamicMBean</item>
-			<item>ECField</item>
-			<item>ECFieldF2m</item>
-			<item>ECFieldFp</item>
-			<item>ECGenParameterSpec</item>
-			<item>ECKey</item>
-			<item>ECParameterSpec</item>
-			<item>ECPoint</item>
-			<item>ECPrivateKey</item>
-			<item>ECPrivateKeySpec</item>
-			<item>ECPublicKey</item>
-			<item>ECPublicKeySpec</item>
-			<item>ENCODING_CDR_ENCAPS</item>
-			<item>EOFException</item>
-			<item>EditorKit</item>
-			<item>Element</item>
-			<item>Element</item>
-			<item>Element</item>
-			<item>ElementIterator</item>
-			<item>ElementType</item>
-			<item>Ellipse2D</item>
-			<item>Ellipse2D.Double</item>
-			<item>Ellipse2D.Float</item>
-			<item>EllipticCurve</item>
-			<item>EmptyBorder</item>
-			<item>EmptyStackException</item>
-			<item>EncodedKeySpec</item>
-			<item>Encoder</item>
-			<item>Encoding</item>
-			<item>EncryptedPrivateKeyInfo</item>
-			<item>Entity</item>
-			<item>Entity</item>
-			<item>EntityReference</item>
-			<item>EntityResolver</item>
-			<item>EntityResolver2</item>
-			<item>Enum</item>
-			<item>EnumConstantNotPresentException</item>
-			<item>EnumControl</item>
-			<item>EnumControl.Type</item>
-			<item>EnumMap</item>
-			<item>EnumSet</item>
-			<item>EnumSyntax</item>
-			<item>Enumeration</item>
-			<item>Environment</item>
-			<item>Error</item>
-			<item>ErrorHandler</item>
-			<item>ErrorListener</item>
-			<item>ErrorManager</item>
-			<item>EtchedBorder</item>
-			<item>Event</item>
-			<item>EventContext</item>
-			<item>EventDirContext</item>
-			<item>EventHandler</item>
-			<item>EventListener</item>
-			<item>EventListenerList</item>
-			<item>EventListenerProxy</item>
-			<item>EventObject</item>
-			<item>EventQueue</item>
-			<item>EventSetDescriptor</item>
-			<item>Exception</item>
-			<item>ExceptionDetailMessage</item>
-			<item>ExceptionInInitializerError</item>
-			<item>ExceptionList</item>
-			<item>ExceptionListener</item>
-			<item>Exchanger</item>
-			<item>ExecutionException</item>
-			<item>Executor</item>
-			<item>ExecutorCompletionService</item>
-			<item>ExecutorService</item>
-			<item>Executors</item>
-			<item>ExemptionMechanism</item>
-			<item>ExemptionMechanismException</item>
-			<item>ExemptionMechanismSpi</item>
-			<item>ExpandVetoException</item>
-			<item>ExportException</item>
-			<item>Expression</item>
-			<item>ExtendedRequest</item>
-			<item>ExtendedResponse</item>
-			<item>Externalizable</item>
-			<item>FREE_MEM</item>
-			<item>FactoryConfigurationError</item>
-			<item>FailedLoginException</item>
-			<item>FeatureDescriptor</item>
-			<item>Fidelity</item>
-			<item>Field</item>
-			<item>FieldNameHelper</item>
-			<item>FieldNameHelper</item>
-			<item>FieldPosition</item>
-			<item>FieldView</item>
-			<item>File</item>
-			<item>FileCacheImageInputStream</item>
-			<item>FileCacheImageOutputStream</item>
-			<item>FileChannel</item>
-			<item>FileChannel.MapMode</item>
-			<item>FileChooserUI</item>
-			<item>FileDescriptor</item>
-			<item>FileDialog</item>
-			<item>FileFilter</item>
-			<item>FileFilter</item>
-			<item>FileHandler</item>
-			<item>FileImageInputStream</item>
-			<item>FileImageOutputStream</item>
-			<item>FileInputStream</item>
-			<item>FileLock</item>
-			<item>FileLockInterruptionException</item>
-			<item>FileNameMap</item>
-			<item>FileNotFoundException</item>
-			<item>FileOutputStream</item>
-			<item>FilePermission</item>
-			<item>FileReader</item>
-			<item>FileSystemView</item>
-			<item>FileView</item>
-			<item>FileWriter</item>
-			<item>FilenameFilter</item>
-			<item>Filter</item>
-			<item>FilterInputStream</item>
-			<item>FilterOutputStream</item>
-			<item>FilterReader</item>
-			<item>FilterWriter</item>
-			<item>FilteredImageSource</item>
-			<item>FilteredRowSet</item>
-			<item>Finishings</item>
-			<item>FixedHeightLayoutCache</item>
-			<item>FixedHolder</item>
-			<item>FlatteningPathIterator</item>
-			<item>FlavorEvent</item>
-			<item>FlavorException</item>
-			<item>FlavorListener</item>
-			<item>FlavorMap</item>
-			<item>FlavorTable</item>
-			<item>Float</item>
-			<item>FloatBuffer</item>
-			<item>FloatControl</item>
-			<item>FloatControl.Type</item>
-			<item>FloatHolder</item>
-			<item>FloatSeqHelper</item>
-			<item>FloatSeqHolder</item>
-			<item>FlowLayout</item>
-			<item>FlowView</item>
-			<item>FlowView.FlowStrategy</item>
-			<item>Flushable</item>
-			<item>FocusAdapter</item>
-			<item>FocusEvent</item>
-			<item>FocusListener</item>
-			<item>FocusManager</item>
-			<item>FocusTraversalPolicy</item>
-			<item>Font</item>
-			<item>FontFormatException</item>
-			<item>FontMetrics</item>
-			<item>FontRenderContext</item>
-			<item>FontUIResource</item>
-			<item>FormSubmitEvent</item>
-			<item>FormSubmitEvent.MethodType</item>
-			<item>FormView</item>
-			<item>Format</item>
-			<item>Format.Field</item>
-			<item>FormatConversionProvider</item>
-			<item>FormatFlagsConversionMismatchException</item>
-			<item>FormatMismatch</item>
-			<item>FormatMismatchHelper</item>
-			<item>Formattable</item>
-			<item>FormattableFlags</item>
-			<item>Formatter</item>
-			<item>Formatter</item>
-			<item>FormatterClosedException</item>
-			<item>ForwardRequest</item>
-			<item>ForwardRequest</item>
-			<item>ForwardRequestHelper</item>
-			<item>ForwardRequestHelper</item>
-			<item>Frame</item>
-			<item>Future</item>
-			<item>FutureTask</item>
-			<item>GSSContext</item>
-			<item>GSSCredential</item>
-			<item>GSSException</item>
-			<item>GSSManager</item>
-			<item>GSSName</item>
-			<item>GZIPInputStream</item>
-			<item>GZIPOutputStream</item>
-			<item>GapContent</item>
-			<item>GarbageCollectorMXBean</item>
-			<item>GatheringByteChannel</item>
-			<item>GaugeMonitor</item>
-			<item>GaugeMonitorMBean</item>
-			<item>GeneralPath</item>
-			<item>GeneralSecurityException</item>
-			<item>GenericArrayType</item>
-			<item>GenericDeclaration</item>
-			<item>GenericSignatureFormatError</item>
-			<item>GlyphJustificationInfo</item>
-			<item>GlyphMetrics</item>
-			<item>GlyphVector</item>
-			<item>GlyphView</item>
-			<item>GlyphView.GlyphPainter</item>
-			<item>GradientPaint</item>
-			<item>GraphicAttribute</item>
-			<item>Graphics</item>
-			<item>Graphics2D</item>
-			<item>GraphicsConfigTemplate</item>
-			<item>GraphicsConfiguration</item>
-			<item>GraphicsDevice</item>
-			<item>GraphicsEnvironment</item>
-			<item>GrayFilter</item>
-			<item>GregorianCalendar</item>
-			<item>GridBagConstraints</item>
-			<item>GridBagLayout</item>
-			<item>GridLayout</item>
-			<item>Group</item>
-			<item>Guard</item>
-			<item>GuardedObject</item>
-			<item>HOLDING</item>
-			<item>HTML</item>
-			<item>HTML.Attribute</item>
-			<item>HTML.Tag</item>
-			<item>HTML.UnknownTag</item>
-			<item>HTMLDocument</item>
-			<item>HTMLDocument.Iterator</item>
-			<item>HTMLEditorKit</item>
-			<item>HTMLEditorKit.HTMLFactory</item>
-			<item>HTMLEditorKit.HTMLTextAction</item>
-			<item>HTMLEditorKit.InsertHTMLTextAction</item>
-			<item>HTMLEditorKit.LinkController</item>
-			<item>HTMLEditorKit.Parser</item>
-			<item>HTMLEditorKit.ParserCallback</item>
-			<item>HTMLFrameHyperlinkEvent</item>
-			<item>HTMLWriter</item>
-			<item>Handler</item>
-			<item>HandlerBase</item>
-			<item>HandshakeCompletedEvent</item>
-			<item>HandshakeCompletedListener</item>
-			<item>HasControls</item>
-			<item>HashAttributeSet</item>
-			<item>HashDocAttributeSet</item>
-			<item>HashMap</item>
-			<item>HashPrintJobAttributeSet</item>
-			<item>HashPrintRequestAttributeSet</item>
-			<item>HashPrintServiceAttributeSet</item>
-			<item>HashSet</item>
-			<item>Hashtable</item>
-			<item>HeadlessException</item>
-			<item>HierarchyBoundsAdapter</item>
-			<item>HierarchyBoundsListener</item>
-			<item>HierarchyEvent</item>
-			<item>HierarchyListener</item>
-			<item>Highlighter</item>
-			<item>Highlighter.Highlight</item>
-			<item>Highlighter.HighlightPainter</item>
-			<item>HostnameVerifier</item>
-			<item>HttpRetryException</item>
-			<item>HttpURLConnection</item>
-			<item>HttpsURLConnection</item>
-			<item>HyperlinkEvent</item>
-			<item>HyperlinkEvent.EventType</item>
-			<item>HyperlinkListener</item>
-			<item>ICC_ColorSpace</item>
-			<item>ICC_Profile</item>
-			<item>ICC_ProfileGray</item>
-			<item>ICC_ProfileRGB</item>
-			<item>IDLEntity</item>
-			<item>IDLType</item>
-			<item>IDLTypeHelper</item>
-			<item>IDLTypeOperations</item>
-			<item>ID_ASSIGNMENT_POLICY_ID</item>
-			<item>ID_UNIQUENESS_POLICY_ID</item>
-			<item>IIOByteBuffer</item>
-			<item>IIOException</item>
-			<item>IIOImage</item>
-			<item>IIOInvalidTreeException</item>
-			<item>IIOMetadata</item>
-			<item>IIOMetadataController</item>
-			<item>IIOMetadataFormat</item>
-			<item>IIOMetadataFormatImpl</item>
-			<item>IIOMetadataNode</item>
-			<item>IIOParam</item>
-			<item>IIOParamController</item>
-			<item>IIOReadProgressListener</item>
-			<item>IIOReadUpdateListener</item>
-			<item>IIOReadWarningListener</item>
-			<item>IIORegistry</item>
-			<item>IIOServiceProvider</item>
-			<item>IIOWriteProgressListener</item>
-			<item>IIOWriteWarningListener</item>
-			<item>IMPLICIT_ACTIVATION_POLICY_ID</item>
-			<item>IMP_LIMIT</item>
-			<item>INACTIVE</item>
-			<item>INITIALIZE</item>
-			<item>INTERNAL</item>
-			<item>INTF_REPOS</item>
-			<item>INVALID_ACTIVITY</item>
-			<item>INVALID_TRANSACTION</item>
-			<item>INV_FLAG</item>
-			<item>INV_IDENT</item>
-			<item>INV_OBJREF</item>
-			<item>INV_POLICY</item>
-			<item>IOException</item>
-			<item>IOR</item>
-			<item>IORHelper</item>
-			<item>IORHolder</item>
-			<item>IORInfo</item>
-			<item>IORInfoOperations</item>
-			<item>IORInterceptor</item>
-			<item>IORInterceptorOperations</item>
-			<item>IORInterceptor_3_0</item>
-			<item>IORInterceptor_3_0Helper</item>
-			<item>IORInterceptor_3_0Holder</item>
-			<item>IORInterceptor_3_0Operations</item>
-			<item>IRObject</item>
-			<item>IRObjectOperations</item>
-			<item>Icon</item>
-			<item>IconUIResource</item>
-			<item>IconView</item>
-			<item>IdAssignmentPolicy</item>
-			<item>IdAssignmentPolicyOperations</item>
-			<item>IdAssignmentPolicyValue</item>
-			<item>IdUniquenessPolicy</item>
-			<item>IdUniquenessPolicyOperations</item>
-			<item>IdUniquenessPolicyValue</item>
-			<item>IdentifierHelper</item>
-			<item>Identity</item>
-			<item>IdentityHashMap</item>
-			<item>IdentityScope</item>
-			<item>IllegalAccessError</item>
-			<item>IllegalAccessException</item>
-			<item>IllegalArgumentException</item>
-			<item>IllegalBlockSizeException</item>
-			<item>IllegalBlockingModeException</item>
-			<item>IllegalCharsetNameException</item>
-			<item>IllegalClassFormatException</item>
-			<item>IllegalComponentStateException</item>
-			<item>IllegalFormatCodePointException</item>
-			<item>IllegalFormatConversionException</item>
-			<item>IllegalFormatException</item>
-			<item>IllegalFormatFlagsException</item>
-			<item>IllegalFormatPrecisionException</item>
-			<item>IllegalFormatWidthException</item>
-			<item>IllegalMonitorStateException</item>
-			<item>IllegalPathStateException</item>
-			<item>IllegalSelectorException</item>
-			<item>IllegalStateException</item>
-			<item>IllegalThreadStateException</item>
-			<item>Image</item>
-			<item>ImageCapabilities</item>
-			<item>ImageConsumer</item>
-			<item>ImageFilter</item>
-			<item>ImageGraphicAttribute</item>
-			<item>ImageIO</item>
-			<item>ImageIcon</item>
-			<item>ImageInputStream</item>
-			<item>ImageInputStreamImpl</item>
-			<item>ImageInputStreamSpi</item>
-			<item>ImageObserver</item>
-			<item>ImageOutputStream</item>
-			<item>ImageOutputStreamImpl</item>
-			<item>ImageOutputStreamSpi</item>
-			<item>ImageProducer</item>
-			<item>ImageReadParam</item>
-			<item>ImageReader</item>
-			<item>ImageReaderSpi</item>
-			<item>ImageReaderWriterSpi</item>
-			<item>ImageTranscoder</item>
-			<item>ImageTranscoderSpi</item>
-			<item>ImageTypeSpecifier</item>
-			<item>ImageView</item>
-			<item>ImageWriteParam</item>
-			<item>ImageWriter</item>
-			<item>ImageWriterSpi</item>
-			<item>ImagingOpException</item>
-			<item>ImplicitActivationPolicy</item>
-			<item>ImplicitActivationPolicyOperations</item>
-			<item>ImplicitActivationPolicyValue</item>
-			<item>IncompatibleClassChangeError</item>
-			<item>IncompleteAnnotationException</item>
-			<item>InconsistentTypeCode</item>
-			<item>InconsistentTypeCode</item>
-			<item>InconsistentTypeCodeHelper</item>
-			<item>IndexColorModel</item>
-			<item>IndexOutOfBoundsException</item>
-			<item>IndexedPropertyChangeEvent</item>
-			<item>IndexedPropertyDescriptor</item>
-			<item>IndirectionException</item>
-			<item>Inet4Address</item>
-			<item>Inet6Address</item>
-			<item>InetAddress</item>
-			<item>InetSocketAddress</item>
-			<item>Inflater</item>
-			<item>InflaterInputStream</item>
-			<item>InheritableThreadLocal</item>
-			<item>Inherited</item>
-			<item>InitialContext</item>
-			<item>InitialContextFactory</item>
-			<item>InitialContextFactoryBuilder</item>
-			<item>InitialDirContext</item>
-			<item>InitialLdapContext</item>
-			<item>InlineView</item>
-			<item>InputContext</item>
-			<item>InputEvent</item>
-			<item>InputMap</item>
-			<item>InputMapUIResource</item>
-			<item>InputMethod</item>
-			<item>InputMethodContext</item>
-			<item>InputMethodDescriptor</item>
-			<item>InputMethodEvent</item>
-			<item>InputMethodHighlight</item>
-			<item>InputMethodListener</item>
-			<item>InputMethodRequests</item>
-			<item>InputMismatchException</item>
-			<item>InputSource</item>
-			<item>InputStream</item>
-			<item>InputStream</item>
-			<item>InputStream</item>
-			<item>InputStreamReader</item>
-			<item>InputSubset</item>
-			<item>InputVerifier</item>
-			<item>Insets</item>
-			<item>InsetsUIResource</item>
-			<item>InstanceAlreadyExistsException</item>
-			<item>InstanceNotFoundException</item>
-			<item>InstantiationError</item>
-			<item>InstantiationException</item>
-			<item>Instrument</item>
-			<item>Instrumentation</item>
-			<item>InsufficientResourcesException</item>
-			<item>IntBuffer</item>
-			<item>IntHolder</item>
-			<item>Integer</item>
-			<item>IntegerSyntax</item>
-			<item>Interceptor</item>
-			<item>InterceptorOperations</item>
-			<item>InternalError</item>
-			<item>InternalFrameAdapter</item>
-			<item>InternalFrameEvent</item>
-			<item>InternalFrameFocusTraversalPolicy</item>
-			<item>InternalFrameListener</item>
-			<item>InternalFrameUI</item>
-			<item>InternationalFormatter</item>
-			<item>InterruptedException</item>
-			<item>InterruptedIOException</item>
-			<item>InterruptedNamingException</item>
-			<item>InterruptibleChannel</item>
-			<item>IntrospectionException</item>
-			<item>IntrospectionException</item>
-			<item>Introspector</item>
-			<item>Invalid</item>
-			<item>InvalidActivityException</item>
-			<item>InvalidAddress</item>
-			<item>InvalidAddressHelper</item>
-			<item>InvalidAddressHolder</item>
-			<item>InvalidAlgorithmParameterException</item>
-			<item>InvalidApplicationException</item>
-			<item>InvalidAttributeIdentifierException</item>
-			<item>InvalidAttributeValueException</item>
-			<item>InvalidAttributeValueException</item>
-			<item>InvalidAttributesException</item>
-			<item>InvalidClassException</item>
-			<item>InvalidDnDOperationException</item>
-			<item>InvalidKeyException</item>
-			<item>InvalidKeyException</item>
-			<item>InvalidKeySpecException</item>
-			<item>InvalidMarkException</item>
-			<item>InvalidMidiDataException</item>
-			<item>InvalidName</item>
-			<item>InvalidName</item>
-			<item>InvalidName</item>
-			<item>InvalidNameException</item>
-			<item>InvalidNameHelper</item>
-			<item>InvalidNameHelper</item>
-			<item>InvalidNameHolder</item>
-			<item>InvalidObjectException</item>
-			<item>InvalidOpenTypeException</item>
-			<item>InvalidParameterException</item>
-			<item>InvalidParameterSpecException</item>
-			<item>InvalidPolicy</item>
-			<item>InvalidPolicyHelper</item>
-			<item>InvalidPreferencesFormatException</item>
-			<item>InvalidPropertiesFormatException</item>
-			<item>InvalidRelationIdException</item>
-			<item>InvalidRelationServiceException</item>
-			<item>InvalidRelationTypeException</item>
-			<item>InvalidRoleInfoException</item>
-			<item>InvalidRoleValueException</item>
-			<item>InvalidSearchControlsException</item>
-			<item>InvalidSearchFilterException</item>
-			<item>InvalidSeq</item>
-			<item>InvalidSlot</item>
-			<item>InvalidSlotHelper</item>
-			<item>InvalidTargetObjectTypeException</item>
-			<item>InvalidTransactionException</item>
-			<item>InvalidTypeForEncoding</item>
-			<item>InvalidTypeForEncodingHelper</item>
-			<item>InvalidValue</item>
-			<item>InvalidValue</item>
-			<item>InvalidValueHelper</item>
-			<item>InvocationEvent</item>
-			<item>InvocationHandler</item>
-			<item>InvocationTargetException</item>
-			<item>InvokeHandler</item>
-			<item>IstringHelper</item>
-			<item>ItemEvent</item>
-			<item>ItemListener</item>
-			<item>ItemSelectable</item>
-			<item>Iterable</item>
-			<item>Iterator</item>
-			<item>IvParameterSpec</item>
-			<item>JApplet</item>
-			<item>JButton</item>
-			<item>JCheckBox</item>
-			<item>JCheckBoxMenuItem</item>
-			<item>JColorChooser</item>
-			<item>JComboBox</item>
-			<item>JComboBox.KeySelectionManager</item>
-			<item>JComponent</item>
-			<item>JDesktopPane</item>
-			<item>JDialog</item>
-			<item>JEditorPane</item>
-			<item>JFileChooser</item>
-			<item>JFormattedTextField</item>
-			<item>JFormattedTextField.AbstractFormatter</item>
-			<item>JFormattedTextField.AbstractFormatterFactory</item>
-			<item>JFrame</item>
-			<item>JInternalFrame</item>
-			<item>JInternalFrame.JDesktopIcon</item>
-			<item>JLabel</item>
-			<item>JLayeredPane</item>
-			<item>JList</item>
-			<item>JMException</item>
-			<item>JMRuntimeException</item>
-			<item>JMXAuthenticator</item>
-			<item>JMXConnectionNotification</item>
-			<item>JMXConnector</item>
-			<item>JMXConnectorFactory</item>
-			<item>JMXConnectorProvider</item>
-			<item>JMXConnectorServer</item>
-			<item>JMXConnectorServerFactory</item>
-			<item>JMXConnectorServerMBean</item>
-			<item>JMXConnectorServerProvider</item>
-			<item>JMXPrincipal</item>
-			<item>JMXProviderException</item>
-			<item>JMXServerErrorException</item>
-			<item>JMXServiceURL</item>
-			<item>JMenu</item>
-			<item>JMenuBar</item>
-			<item>JMenuItem</item>
-			<item>JOptionPane</item>
-			<item>JPEGHuffmanTable</item>
-			<item>JPEGImageReadParam</item>
-			<item>JPEGImageWriteParam</item>
-			<item>JPEGQTable</item>
-			<item>JPanel</item>
-			<item>JPasswordField</item>
-			<item>JPopupMenu</item>
-			<item>JPopupMenu.Separator</item>
-			<item>JProgressBar</item>
-			<item>JRadioButton</item>
-			<item>JRadioButtonMenuItem</item>
-			<item>JRootPane</item>
-			<item>JScrollBar</item>
-			<item>JScrollPane</item>
-			<item>JSeparator</item>
-			<item>JSlider</item>
-			<item>JSpinner</item>
-			<item>JSpinner.DateEditor</item>
-			<item>JSpinner.DefaultEditor</item>
-			<item>JSpinner.ListEditor</item>
-			<item>JSpinner.NumberEditor</item>
-			<item>JSplitPane</item>
-			<item>JTabbedPane</item>
-			<item>JTable</item>
-			<item>JTable.PrintMode</item>
-			<item>JTableHeader</item>
-			<item>JTextArea</item>
-			<item>JTextComponent</item>
-			<item>JTextComponent.KeyBinding</item>
-			<item>JTextField</item>
-			<item>JTextPane</item>
-			<item>JToggleButton</item>
-			<item>JToggleButton.ToggleButtonModel</item>
-			<item>JToolBar</item>
-			<item>JToolBar.Separator</item>
-			<item>JToolTip</item>
-			<item>JTree</item>
-			<item>JTree.DynamicUtilTreeNode</item>
-			<item>JTree.EmptySelectionModel</item>
-			<item>JViewport</item>
-			<item>JWindow</item>
-			<item>JarEntry</item>
-			<item>JarException</item>
-			<item>JarFile</item>
-			<item>JarInputStream</item>
-			<item>JarOutputStream</item>
-			<item>JarURLConnection</item>
-			<item>JdbcRowSet</item>
-			<item>JobAttributes</item>
-			<item>JobAttributes.DefaultSelectionType</item>
-			<item>JobAttributes.DestinationType</item>
-			<item>JobAttributes.DialogType</item>
-			<item>JobAttributes.MultipleDocumentHandlingType</item>
-			<item>JobAttributes.SidesType</item>
-			<item>JobHoldUntil</item>
-			<item>JobImpressions</item>
-			<item>JobImpressionsCompleted</item>
-			<item>JobImpressionsSupported</item>
-			<item>JobKOctets</item>
-			<item>JobKOctetsProcessed</item>
-			<item>JobKOctetsSupported</item>
-			<item>JobMediaSheets</item>
-			<item>JobMediaSheetsCompleted</item>
-			<item>JobMediaSheetsSupported</item>
-			<item>JobMessageFromOperator</item>
-			<item>JobName</item>
-			<item>JobOriginatingUserName</item>
-			<item>JobPriority</item>
-			<item>JobPrioritySupported</item>
-			<item>JobSheets</item>
-			<item>JobState</item>
-			<item>JobStateReason</item>
-			<item>JobStateReasons</item>
-			<item>JoinRowSet</item>
-			<item>Joinable</item>
-			<item>KerberosKey</item>
-			<item>KerberosPrincipal</item>
-			<item>KerberosTicket</item>
-			<item>Kernel</item>
-			<item>Key</item>
-			<item>KeyAdapter</item>
-			<item>KeyAgreement</item>
-			<item>KeyAgreementSpi</item>
-			<item>KeyAlreadyExistsException</item>
-			<item>KeyEvent</item>
-			<item>KeyEventDispatcher</item>
-			<item>KeyEventPostProcessor</item>
-			<item>KeyException</item>
-			<item>KeyFactory</item>
-			<item>KeyFactorySpi</item>
-			<item>KeyGenerator</item>
-			<item>KeyGeneratorSpi</item>
-			<item>KeyListener</item>
-			<item>KeyManagementException</item>
-			<item>KeyManager</item>
-			<item>KeyManagerFactory</item>
-			<item>KeyManagerFactorySpi</item>
-			<item>KeyPair</item>
-			<item>KeyPairGenerator</item>
-			<item>KeyPairGeneratorSpi</item>
-			<item>KeyRep</item>
-			<item>KeyRep.Type</item>
-			<item>KeySpec</item>
-			<item>KeyStore</item>
-			<item>KeyStore.Builder</item>
-			<item>KeyStore.CallbackHandlerProtection</item>
-			<item>KeyStore.Entry</item>
-			<item>KeyStore.LoadStoreParameter</item>
-			<item>KeyStore.PasswordProtection</item>
-			<item>KeyStore.PrivateKeyEntry</item>
-			<item>KeyStore.ProtectionParameter</item>
-			<item>KeyStore.SecretKeyEntry</item>
-			<item>KeyStore.TrustedCertificateEntry</item>
-			<item>KeyStoreBuilderParameters</item>
-			<item>KeyStoreException</item>
-			<item>KeyStoreSpi</item>
-			<item>KeyStroke</item>
-			<item>KeyboardFocusManager</item>
-			<item>Keymap</item>
-			<item>LDAPCertStoreParameters</item>
-			<item>LIFESPAN_POLICY_ID</item>
-			<item>LOCATION_FORWARD</item>
-			<item>LSException</item>
-			<item>LSInput</item>
-			<item>LSLoadEvent</item>
-			<item>LSOutput</item>
-			<item>LSParser</item>
-			<item>LSParserFilter</item>
-			<item>LSProgressEvent</item>
-			<item>LSResourceResolver</item>
-			<item>LSSerializer</item>
-			<item>LSSerializerFilter</item>
-			<item>Label</item>
-			<item>LabelUI</item>
-			<item>LabelView</item>
-			<item>LanguageCallback</item>
-			<item>LastOwnerException</item>
-			<item>LayeredHighlighter</item>
-			<item>LayeredHighlighter.LayerPainter</item>
-			<item>LayoutFocusTraversalPolicy</item>
-			<item>LayoutManager</item>
-			<item>LayoutManager2</item>
-			<item>LayoutQueue</item>
-			<item>LdapContext</item>
-			<item>LdapName</item>
-			<item>LdapReferralException</item>
-			<item>Lease</item>
-			<item>Level</item>
-			<item>LexicalHandler</item>
-			<item>LifespanPolicy</item>
-			<item>LifespanPolicyOperations</item>
-			<item>LifespanPolicyValue</item>
-			<item>LimitExceededException</item>
-			<item>Line</item>
-			<item>Line.Info</item>
-			<item>Line2D</item>
-			<item>Line2D.Double</item>
-			<item>Line2D.Float</item>
-			<item>LineBorder</item>
-			<item>LineBreakMeasurer</item>
-			<item>LineEvent</item>
-			<item>LineEvent.Type</item>
-			<item>LineListener</item>
-			<item>LineMetrics</item>
-			<item>LineNumberInputStream</item>
-			<item>LineNumberReader</item>
-			<item>LineUnavailableException</item>
-			<item>LinkException</item>
-			<item>LinkLoopException</item>
-			<item>LinkRef</item>
-			<item>LinkageError</item>
-			<item>LinkedBlockingQueue</item>
-			<item>LinkedHashMap</item>
-			<item>LinkedHashSet</item>
-			<item>LinkedList</item>
-			<item>List</item>
-			<item>List</item>
-			<item>ListCellRenderer</item>
-			<item>ListDataEvent</item>
-			<item>ListDataListener</item>
-			<item>ListIterator</item>
-			<item>ListModel</item>
-			<item>ListResourceBundle</item>
-			<item>ListSelectionEvent</item>
-			<item>ListSelectionListener</item>
-			<item>ListSelectionModel</item>
-			<item>ListUI</item>
-			<item>ListView</item>
-			<item>ListenerNotFoundException</item>
-			<item>LoaderHandler</item>
-			<item>LocalObject</item>
-			<item>Locale</item>
-			<item>LocateRegistry</item>
-			<item>Locator</item>
-			<item>Locator2</item>
-			<item>Locator2Impl</item>
-			<item>LocatorImpl</item>
-			<item>Lock</item>
-			<item>LockSupport</item>
-			<item>LogManager</item>
-			<item>LogRecord</item>
-			<item>LogStream</item>
-			<item>Logger</item>
-			<item>LoggingMXBean</item>
-			<item>LoggingPermission</item>
-			<item>LoginContext</item>
-			<item>LoginException</item>
-			<item>LoginModule</item>
-			<item>Long</item>
-			<item>LongBuffer</item>
-			<item>LongHolder</item>
-			<item>LongLongSeqHelper</item>
-			<item>LongLongSeqHolder</item>
-			<item>LongSeqHelper</item>
-			<item>LongSeqHolder</item>
-			<item>LookAndFeel</item>
-			<item>LookupOp</item>
-			<item>LookupTable</item>
-			<item>MARSHAL</item>
-			<item>MBeanAttributeInfo</item>
-			<item>MBeanConstructorInfo</item>
-			<item>MBeanException</item>
-			<item>MBeanFeatureInfo</item>
-			<item>MBeanInfo</item>
-			<item>MBeanNotificationInfo</item>
-			<item>MBeanOperationInfo</item>
-			<item>MBeanParameterInfo</item>
-			<item>MBeanPermission</item>
-			<item>MBeanRegistration</item>
-			<item>MBeanRegistrationException</item>
-			<item>MBeanServer</item>
-			<item>MBeanServerBuilder</item>
-			<item>MBeanServerConnection</item>
-			<item>MBeanServerDelegate</item>
-			<item>MBeanServerDelegateMBean</item>
-			<item>MBeanServerFactory</item>
-			<item>MBeanServerForwarder</item>
-			<item>MBeanServerInvocationHandler</item>
-			<item>MBeanServerNotification</item>
-			<item>MBeanServerNotificationFilter</item>
-			<item>MBeanServerPermission</item>
-			<item>MBeanTrustPermission</item>
-			<item>MGF1ParameterSpec</item>
-			<item>MLet</item>
-			<item>MLetMBean</item>
-			<item>Mac</item>
-			<item>MacSpi</item>
-			<item>MalformedInputException</item>
-			<item>MalformedLinkException</item>
-			<item>MalformedObjectNameException</item>
-			<item>MalformedParameterizedTypeException</item>
-			<item>MalformedURLException</item>
-			<item>ManageReferralControl</item>
-			<item>ManagementFactory</item>
-			<item>ManagementPermission</item>
-			<item>ManagerFactoryParameters</item>
-			<item>Manifest</item>
-			<item>Map</item>
-			<item>Map.Entry</item>
-			<item>MappedByteBuffer</item>
-			<item>MarshalException</item>
-			<item>MarshalledObject</item>
-			<item>MaskFormatter</item>
-			<item>MatchResult</item>
-			<item>Matcher</item>
-			<item>Math</item>
-			<item>MathContext</item>
-			<item>MatteBorder</item>
-			<item>Media</item>
-			<item>MediaName</item>
-			<item>MediaPrintableArea</item>
-			<item>MediaSize</item>
-			<item>MediaSize.Engineering</item>
-			<item>MediaSize.ISO</item>
-			<item>MediaSize.JIS</item>
-			<item>MediaSize.NA</item>
-			<item>MediaSize.Other</item>
-			<item>MediaSizeName</item>
-			<item>MediaTracker</item>
-			<item>MediaTray</item>
-			<item>Member</item>
-			<item>MemoryCacheImageInputStream</item>
-			<item>MemoryCacheImageOutputStream</item>
-			<item>MemoryHandler</item>
-			<item>MemoryImageSource</item>
-			<item>MemoryMXBean</item>
-			<item>MemoryManagerMXBean</item>
-			<item>MemoryNotificationInfo</item>
-			<item>MemoryPoolMXBean</item>
-			<item>MemoryType</item>
-			<item>MemoryUsage</item>
-			<item>Menu</item>
-			<item>MenuBar</item>
-			<item>MenuBarUI</item>
-			<item>MenuComponent</item>
-			<item>MenuContainer</item>
-			<item>MenuDragMouseEvent</item>
-			<item>MenuDragMouseListener</item>
-			<item>MenuElement</item>
-			<item>MenuEvent</item>
-			<item>MenuItem</item>
-			<item>MenuItemUI</item>
-			<item>MenuKeyEvent</item>
-			<item>MenuKeyListener</item>
-			<item>MenuListener</item>
-			<item>MenuSelectionManager</item>
-			<item>MenuShortcut</item>
-			<item>MessageDigest</item>
-			<item>MessageDigestSpi</item>
-			<item>MessageFormat</item>
-			<item>MessageFormat.Field</item>
-			<item>MessageProp</item>
-			<item>MetaEventListener</item>
-			<item>MetaMessage</item>
-			<item>MetalBorders</item>
-			<item>MetalBorders.ButtonBorder</item>
-			<item>MetalBorders.Flush3DBorder</item>
-			<item>MetalBorders.InternalFrameBorder</item>
-			<item>MetalBorders.MenuBarBorder</item>
-			<item>MetalBorders.MenuItemBorder</item>
-			<item>MetalBorders.OptionDialogBorder</item>
-			<item>MetalBorders.PaletteBorder</item>
-			<item>MetalBorders.PopupMenuBorder</item>
-			<item>MetalBorders.RolloverButtonBorder</item>
-			<item>MetalBorders.ScrollPaneBorder</item>
-			<item>MetalBorders.TableHeaderBorder</item>
-			<item>MetalBorders.TextFieldBorder</item>
-			<item>MetalBorders.ToggleButtonBorder</item>
-			<item>MetalBorders.ToolBarBorder</item>
-			<item>MetalButtonUI</item>
-			<item>MetalCheckBoxIcon</item>
-			<item>MetalCheckBoxUI</item>
-			<item>MetalComboBoxButton</item>
-			<item>MetalComboBoxEditor</item>
-			<item>MetalComboBoxEditor.UIResource</item>
-			<item>MetalComboBoxIcon</item>
-			<item>MetalComboBoxUI</item>
-			<item>MetalDesktopIconUI</item>
-			<item>MetalFileChooserUI</item>
-			<item>MetalIconFactory</item>
-			<item>MetalIconFactory.FileIcon16</item>
-			<item>MetalIconFactory.FolderIcon16</item>
-			<item>MetalIconFactory.PaletteCloseIcon</item>
-			<item>MetalIconFactory.TreeControlIcon</item>
-			<item>MetalIconFactory.TreeFolderIcon</item>
-			<item>MetalIconFactory.TreeLeafIcon</item>
-			<item>MetalInternalFrameTitlePane</item>
-			<item>MetalInternalFrameUI</item>
-			<item>MetalLabelUI</item>
-			<item>MetalLookAndFeel</item>
-			<item>MetalMenuBarUI</item>
-			<item>MetalPopupMenuSeparatorUI</item>
-			<item>MetalProgressBarUI</item>
-			<item>MetalRadioButtonUI</item>
-			<item>MetalRootPaneUI</item>
-			<item>MetalScrollBarUI</item>
-			<item>MetalScrollButton</item>
-			<item>MetalScrollPaneUI</item>
-			<item>MetalSeparatorUI</item>
-			<item>MetalSliderUI</item>
-			<item>MetalSplitPaneUI</item>
-			<item>MetalTabbedPaneUI</item>
-			<item>MetalTextFieldUI</item>
-			<item>MetalTheme</item>
-			<item>MetalToggleButtonUI</item>
-			<item>MetalToolBarUI</item>
-			<item>MetalToolTipUI</item>
-			<item>MetalTreeUI</item>
-			<item>Method</item>
-			<item>MethodDescriptor</item>
-			<item>MidiChannel</item>
-			<item>MidiDevice</item>
-			<item>MidiDevice.Info</item>
-			<item>MidiDeviceProvider</item>
-			<item>MidiEvent</item>
-			<item>MidiFileFormat</item>
-			<item>MidiFileReader</item>
-			<item>MidiFileWriter</item>
-			<item>MidiMessage</item>
-			<item>MidiSystem</item>
-			<item>MidiUnavailableException</item>
-			<item>MimeTypeParseException</item>
-			<item>MinimalHTMLWriter</item>
-			<item>MissingFormatArgumentException</item>
-			<item>MissingFormatWidthException</item>
-			<item>MissingResourceException</item>
-			<item>Mixer</item>
-			<item>Mixer.Info</item>
-			<item>MixerProvider</item>
-			<item>ModelMBean</item>
-			<item>ModelMBeanAttributeInfo</item>
-			<item>ModelMBeanConstructorInfo</item>
-			<item>ModelMBeanInfo</item>
-			<item>ModelMBeanInfoSupport</item>
-			<item>ModelMBeanNotificationBroadcaster</item>
-			<item>ModelMBeanNotificationInfo</item>
-			<item>ModelMBeanOperationInfo</item>
-			<item>ModificationItem</item>
-			<item>Modifier</item>
-			<item>Monitor</item>
-			<item>MonitorMBean</item>
-			<item>MonitorNotification</item>
-			<item>MonitorSettingException</item>
-			<item>MouseAdapter</item>
-			<item>MouseDragGestureRecognizer</item>
-			<item>MouseEvent</item>
-			<item>MouseInfo</item>
-			<item>MouseInputAdapter</item>
-			<item>MouseInputListener</item>
-			<item>MouseListener</item>
-			<item>MouseMotionAdapter</item>
-			<item>MouseMotionListener</item>
-			<item>MouseWheelEvent</item>
-			<item>MouseWheelListener</item>
-			<item>MultiButtonUI</item>
-			<item>MultiColorChooserUI</item>
-			<item>MultiComboBoxUI</item>
-			<item>MultiDesktopIconUI</item>
-			<item>MultiDesktopPaneUI</item>
-			<item>MultiDoc</item>
-			<item>MultiDocPrintJob</item>
-			<item>MultiDocPrintService</item>
-			<item>MultiFileChooserUI</item>
-			<item>MultiInternalFrameUI</item>
-			<item>MultiLabelUI</item>
-			<item>MultiListUI</item>
-			<item>MultiLookAndFeel</item>
-			<item>MultiMenuBarUI</item>
-			<item>MultiMenuItemUI</item>
-			<item>MultiOptionPaneUI</item>
-			<item>MultiPanelUI</item>
-			<item>MultiPixelPackedSampleModel</item>
-			<item>MultiPopupMenuUI</item>
-			<item>MultiProgressBarUI</item>
-			<item>MultiRootPaneUI</item>
-			<item>MultiScrollBarUI</item>
-			<item>MultiScrollPaneUI</item>
-			<item>MultiSeparatorUI</item>
-			<item>MultiSliderUI</item>
-			<item>MultiSpinnerUI</item>
-			<item>MultiSplitPaneUI</item>
-			<item>MultiTabbedPaneUI</item>
-			<item>MultiTableHeaderUI</item>
-			<item>MultiTableUI</item>
-			<item>MultiTextUI</item>
-			<item>MultiToolBarUI</item>
-			<item>MultiToolTipUI</item>
-			<item>MultiTreeUI</item>
-			<item>MultiViewportUI</item>
-			<item>MulticastSocket</item>
-			<item>MultipleComponentProfileHelper</item>
-			<item>MultipleComponentProfileHolder</item>
-			<item>MultipleDocumentHandling</item>
-			<item>MultipleMaster</item>
-			<item>MutableAttributeSet</item>
-			<item>MutableComboBoxModel</item>
-			<item>MutableTreeNode</item>
-			<item>NON_EXISTENT</item>
-			<item>NO_IMPLEMENT</item>
-			<item>NO_MEMORY</item>
-			<item>NO_PERMISSION</item>
-			<item>NO_RESOURCES</item>
-			<item>NO_RESPONSE</item>
-			<item>NVList</item>
-			<item>Name</item>
-			<item>NameAlreadyBoundException</item>
-			<item>NameCallback</item>
-			<item>NameClassPair</item>
-			<item>NameComponent</item>
-			<item>NameComponentHelper</item>
-			<item>NameComponentHolder</item>
-			<item>NameDynAnyPair</item>
-			<item>NameDynAnyPairHelper</item>
-			<item>NameDynAnyPairSeqHelper</item>
-			<item>NameHelper</item>
-			<item>NameHolder</item>
-			<item>NameList</item>
-			<item>NameNotFoundException</item>
-			<item>NameParser</item>
-			<item>NameValuePair</item>
-			<item>NameValuePair</item>
-			<item>NameValuePairHelper</item>
-			<item>NameValuePairHelper</item>
-			<item>NameValuePairSeqHelper</item>
-			<item>NamedNodeMap</item>
-			<item>NamedValue</item>
-			<item>NamespaceChangeListener</item>
-			<item>NamespaceContext</item>
-			<item>NamespaceSupport</item>
-			<item>Naming</item>
-			<item>NamingContext</item>
-			<item>NamingContextExt</item>
-			<item>NamingContextExtHelper</item>
-			<item>NamingContextExtHolder</item>
-			<item>NamingContextExtOperations</item>
-			<item>NamingContextExtPOA</item>
-			<item>NamingContextHelper</item>
-			<item>NamingContextHolder</item>
-			<item>NamingContextOperations</item>
-			<item>NamingContextPOA</item>
-			<item>NamingEnumeration</item>
-			<item>NamingEvent</item>
-			<item>NamingException</item>
-			<item>NamingExceptionEvent</item>
-			<item>NamingListener</item>
-			<item>NamingManager</item>
-			<item>NamingSecurityException</item>
-			<item>NavigationFilter</item>
-			<item>NavigationFilter.FilterBypass</item>
-			<item>NegativeArraySizeException</item>
-			<item>NetPermission</item>
-			<item>NetworkInterface</item>
-			<item>NoClassDefFoundError</item>
-			<item>NoConnectionPendingException</item>
-			<item>NoContext</item>
-			<item>NoContextHelper</item>
-			<item>NoInitialContextException</item>
-			<item>NoPermissionException</item>
-			<item>NoRouteToHostException</item>
-			<item>NoServant</item>
-			<item>NoServantHelper</item>
-			<item>NoSuchAlgorithmException</item>
-			<item>NoSuchAttributeException</item>
-			<item>NoSuchElementException</item>
-			<item>NoSuchFieldError</item>
-			<item>NoSuchFieldException</item>
-			<item>NoSuchMethodError</item>
-			<item>NoSuchMethodException</item>
-			<item>NoSuchObjectException</item>
-			<item>NoSuchPaddingException</item>
-			<item>NoSuchProviderException</item>
-			<item>Node</item>
-			<item>NodeChangeEvent</item>
-			<item>NodeChangeListener</item>
-			<item>NodeList</item>
-			<item>NonReadableChannelException</item>
-			<item>NonWritableChannelException</item>
-			<item>NoninvertibleTransformException</item>
-			<item>NotActiveException</item>
-			<item>NotBoundException</item>
-			<item>NotCompliantMBeanException</item>
-			<item>NotContextException</item>
-			<item>NotEmpty</item>
-			<item>NotEmptyHelper</item>
-			<item>NotEmptyHolder</item>
-			<item>NotFound</item>
-			<item>NotFoundHelper</item>
-			<item>NotFoundHolder</item>
-			<item>NotFoundReason</item>
-			<item>NotFoundReasonHelper</item>
-			<item>NotFoundReasonHolder</item>
-			<item>NotOwnerException</item>
-			<item>NotSerializableException</item>
-			<item>NotYetBoundException</item>
-			<item>NotYetConnectedException</item>
-			<item>Notation</item>
-			<item>Notification</item>
-			<item>NotificationBroadcaster</item>
-			<item>NotificationBroadcasterSupport</item>
-			<item>NotificationEmitter</item>
-			<item>NotificationFilter</item>
-			<item>NotificationFilterSupport</item>
-			<item>NotificationListener</item>
-			<item>NotificationResult</item>
-			<item>NullCipher</item>
-			<item>NullPointerException</item>
-			<item>Number</item>
-			<item>NumberFormat</item>
-			<item>NumberFormat.Field</item>
-			<item>NumberFormatException</item>
-			<item>NumberFormatter</item>
-			<item>NumberOfDocuments</item>
-			<item>NumberOfInterveningJobs</item>
-			<item>NumberUp</item>
-			<item>NumberUpSupported</item>
-			<item>NumericShaper</item>
-			<item>OAEPParameterSpec</item>
-			<item>OBJECT_NOT_EXIST</item>
-			<item>OBJ_ADAPTER</item>
-			<item>OMGVMCID</item>
-			<item>ORB</item>
-			<item>ORB</item>
-			<item>ORBIdHelper</item>
-			<item>ORBInitInfo</item>
-			<item>ORBInitInfoOperations</item>
-			<item>ORBInitializer</item>
-			<item>ORBInitializerOperations</item>
-			<item>ObjID</item>
-			<item>Object</item>
-			<item>Object</item>
-			<item>ObjectAlreadyActive</item>
-			<item>ObjectAlreadyActiveHelper</item>
-			<item>ObjectChangeListener</item>
-			<item>ObjectFactory</item>
-			<item>ObjectFactoryBuilder</item>
-			<item>ObjectHelper</item>
-			<item>ObjectHolder</item>
-			<item>ObjectIdHelper</item>
-			<item>ObjectIdHelper</item>
-			<item>ObjectImpl</item>
-			<item>ObjectImpl</item>
-			<item>ObjectInput</item>
-			<item>ObjectInputStream</item>
-			<item>ObjectInputStream.GetField</item>
-			<item>ObjectInputValidation</item>
-			<item>ObjectInstance</item>
-			<item>ObjectName</item>
-			<item>ObjectNotActive</item>
-			<item>ObjectNotActiveHelper</item>
-			<item>ObjectOutput</item>
-			<item>ObjectOutputStream</item>
-			<item>ObjectOutputStream.PutField</item>
-			<item>ObjectReferenceFactory</item>
-			<item>ObjectReferenceFactoryHelper</item>
-			<item>ObjectReferenceFactoryHolder</item>
-			<item>ObjectReferenceTemplate</item>
-			<item>ObjectReferenceTemplateHelper</item>
-			<item>ObjectReferenceTemplateHolder</item>
-			<item>ObjectReferenceTemplateSeqHelper</item>
-			<item>ObjectReferenceTemplateSeqHolder</item>
-			<item>ObjectStreamClass</item>
-			<item>ObjectStreamConstants</item>
-			<item>ObjectStreamException</item>
-			<item>ObjectStreamField</item>
-			<item>ObjectView</item>
-			<item>Observable</item>
-			<item>Observer</item>
-			<item>OceanTheme</item>
-			<item>OctetSeqHelper</item>
-			<item>OctetSeqHolder</item>
-			<item>Oid</item>
-			<item>OpenDataException</item>
-			<item>OpenMBeanAttributeInfo</item>
-			<item>OpenMBeanAttributeInfoSupport</item>
-			<item>OpenMBeanConstructorInfo</item>
-			<item>OpenMBeanConstructorInfoSupport</item>
-			<item>OpenMBeanInfo</item>
-			<item>OpenMBeanInfoSupport</item>
-			<item>OpenMBeanOperationInfo</item>
-			<item>OpenMBeanOperationInfoSupport</item>
-			<item>OpenMBeanParameterInfo</item>
-			<item>OpenMBeanParameterInfoSupport</item>
-			<item>OpenType</item>
-			<item>OpenType</item>
-			<item>OperatingSystemMXBean</item>
-			<item>Operation</item>
-			<item>OperationNotSupportedException</item>
-			<item>OperationsException</item>
-			<item>Option</item>
-			<item>OptionPaneUI</item>
-			<item>OptionalDataException</item>
-			<item>OrientationRequested</item>
-			<item>OutOfMemoryError</item>
-			<item>OutputDeviceAssigned</item>
-			<item>OutputKeys</item>
-			<item>OutputStream</item>
-			<item>OutputStream</item>
-			<item>OutputStream</item>
-			<item>OutputStreamWriter</item>
-			<item>OverlappingFileLockException</item>
-			<item>OverlayLayout</item>
-			<item>Override</item>
-			<item>Owner</item>
-			<item>PBEKey</item>
-			<item>PBEKeySpec</item>
-			<item>PBEParameterSpec</item>
-			<item>PDLOverrideSupported</item>
-			<item>PERSIST_STORE</item>
-			<item>PKCS8EncodedKeySpec</item>
-			<item>PKIXBuilderParameters</item>
-			<item>PKIXCertPathBuilderResult</item>
-			<item>PKIXCertPathChecker</item>
-			<item>PKIXCertPathValidatorResult</item>
-			<item>PKIXParameters</item>
-			<item>POA</item>
-			<item>POAHelper</item>
-			<item>POAManager</item>
-			<item>POAManagerOperations</item>
-			<item>POAOperations</item>
-			<item>PRIVATE_MEMBER</item>
-			<item>PSSParameterSpec</item>
-			<item>PSource</item>
-			<item>PSource.PSpecified</item>
-			<item>PUBLIC_MEMBER</item>
-			<item>Pack200</item>
-			<item>Pack200.Packer</item>
-			<item>Pack200.Unpacker</item>
-			<item>Package</item>
-			<item>PackedColorModel</item>
-			<item>PageAttributes</item>
-			<item>PageAttributes.ColorType</item>
-			<item>PageAttributes.MediaType</item>
-			<item>PageAttributes.OrientationRequestedType</item>
-			<item>PageAttributes.OriginType</item>
-			<item>PageAttributes.PrintQualityType</item>
-			<item>PageFormat</item>
-			<item>PageRanges</item>
-			<item>Pageable</item>
-			<item>PagedResultsControl</item>
-			<item>PagedResultsResponseControl</item>
-			<item>PagesPerMinute</item>
-			<item>PagesPerMinuteColor</item>
-			<item>Paint</item>
-			<item>PaintContext</item>
-			<item>PaintEvent</item>
-			<item>Panel</item>
-			<item>PanelUI</item>
-			<item>Paper</item>
-			<item>ParagraphView</item>
-			<item>ParagraphView</item>
-			<item>Parameter</item>
-			<item>ParameterBlock</item>
-			<item>ParameterDescriptor</item>
-			<item>ParameterMetaData</item>
-			<item>ParameterMode</item>
-			<item>ParameterModeHelper</item>
-			<item>ParameterModeHolder</item>
-			<item>ParameterizedType</item>
-			<item>ParseException</item>
-			<item>ParsePosition</item>
-			<item>Parser</item>
-			<item>Parser</item>
-			<item>ParserAdapter</item>
-			<item>ParserConfigurationException</item>
-			<item>ParserDelegator</item>
-			<item>ParserFactory</item>
-			<item>PartialResultException</item>
-			<item>PasswordAuthentication</item>
-			<item>PasswordCallback</item>
-			<item>PasswordView</item>
-			<item>Patch</item>
-			<item>PathIterator</item>
-			<item>Pattern</item>
-			<item>PatternSyntaxException</item>
-			<item>Permission</item>
-			<item>Permission</item>
-			<item>PermissionCollection</item>
-			<item>Permissions</item>
-			<item>PersistenceDelegate</item>
-			<item>PersistentMBean</item>
-			<item>PhantomReference</item>
-			<item>Pipe</item>
-			<item>Pipe.SinkChannel</item>
-			<item>Pipe.SourceChannel</item>
-			<item>PipedInputStream</item>
-			<item>PipedOutputStream</item>
-			<item>PipedReader</item>
-			<item>PipedWriter</item>
-			<item>PixelGrabber</item>
-			<item>PixelInterleavedSampleModel</item>
-			<item>PlainDocument</item>
-			<item>PlainView</item>
-			<item>Point</item>
-			<item>Point2D</item>
-			<item>Point2D.Double</item>
-			<item>Point2D.Float</item>
-			<item>PointerInfo</item>
-			<item>Policy</item>
-			<item>Policy</item>
-			<item>Policy</item>
-			<item>PolicyError</item>
-			<item>PolicyErrorCodeHelper</item>
-			<item>PolicyErrorHelper</item>
-			<item>PolicyErrorHolder</item>
-			<item>PolicyFactory</item>
-			<item>PolicyFactoryOperations</item>
-			<item>PolicyHelper</item>
-			<item>PolicyHolder</item>
-			<item>PolicyListHelper</item>
-			<item>PolicyListHolder</item>
-			<item>PolicyNode</item>
-			<item>PolicyOperations</item>
-			<item>PolicyQualifierInfo</item>
-			<item>PolicyTypeHelper</item>
-			<item>Polygon</item>
-			<item>PooledConnection</item>
-			<item>Popup</item>
-			<item>PopupFactory</item>
-			<item>PopupMenu</item>
-			<item>PopupMenuEvent</item>
-			<item>PopupMenuListener</item>
-			<item>PopupMenuUI</item>
-			<item>Port</item>
-			<item>Port.Info</item>
-			<item>PortUnreachableException</item>
-			<item>PortableRemoteObject</item>
-			<item>PortableRemoteObjectDelegate</item>
-			<item>Position</item>
-			<item>Position.Bias</item>
-			<item>Predicate</item>
-			<item>PreferenceChangeEvent</item>
-			<item>PreferenceChangeListener</item>
-			<item>Preferences</item>
-			<item>PreferencesFactory</item>
-			<item>PreparedStatement</item>
-			<item>PresentationDirection</item>
-			<item>Principal</item>
-			<item>Principal</item>
-			<item>PrincipalHolder</item>
-			<item>PrintEvent</item>
-			<item>PrintException</item>
-			<item>PrintGraphics</item>
-			<item>PrintJob</item>
-			<item>PrintJobAdapter</item>
-			<item>PrintJobAttribute</item>
-			<item>PrintJobAttributeEvent</item>
-			<item>PrintJobAttributeListener</item>
-			<item>PrintJobAttributeSet</item>
-			<item>PrintJobEvent</item>
-			<item>PrintJobListener</item>
-			<item>PrintQuality</item>
-			<item>PrintRequestAttribute</item>
-			<item>PrintRequestAttributeSet</item>
-			<item>PrintService</item>
-			<item>PrintServiceAttribute</item>
-			<item>PrintServiceAttributeEvent</item>
-			<item>PrintServiceAttributeListener</item>
-			<item>PrintServiceAttributeSet</item>
-			<item>PrintServiceLookup</item>
-			<item>PrintStream</item>
-			<item>PrintWriter</item>
-			<item>Printable</item>
-			<item>PrinterAbortException</item>
-			<item>PrinterException</item>
-			<item>PrinterGraphics</item>
-			<item>PrinterIOException</item>
-			<item>PrinterInfo</item>
-			<item>PrinterIsAcceptingJobs</item>
-			<item>PrinterJob</item>
-			<item>PrinterLocation</item>
-			<item>PrinterMakeAndModel</item>
-			<item>PrinterMessageFromOperator</item>
-			<item>PrinterMoreInfo</item>
-			<item>PrinterMoreInfoManufacturer</item>
-			<item>PrinterName</item>
-			<item>PrinterResolution</item>
-			<item>PrinterState</item>
-			<item>PrinterStateReason</item>
-			<item>PrinterStateReasons</item>
-			<item>PrinterURI</item>
-			<item>PriorityBlockingQueue</item>
-			<item>PriorityQueue</item>
-			<item>PrivateClassLoader</item>
-			<item>PrivateCredentialPermission</item>
-			<item>PrivateKey</item>
-			<item>PrivateMLet</item>
-			<item>PrivilegedAction</item>
-			<item>PrivilegedActionException</item>
-			<item>PrivilegedExceptionAction</item>
-			<item>Process</item>
-			<item>ProcessBuilder</item>
-			<item>ProcessingInstruction</item>
-			<item>ProfileDataException</item>
-			<item>ProfileIdHelper</item>
-			<item>ProgressBarUI</item>
-			<item>ProgressMonitor</item>
-			<item>ProgressMonitorInputStream</item>
-			<item>Properties</item>
-			<item>PropertyChangeEvent</item>
-			<item>PropertyChangeListener</item>
-			<item>PropertyChangeListenerProxy</item>
-			<item>PropertyChangeSupport</item>
-			<item>PropertyDescriptor</item>
-			<item>PropertyEditor</item>
-			<item>PropertyEditorManager</item>
-			<item>PropertyEditorSupport</item>
-			<item>PropertyPermission</item>
-			<item>PropertyResourceBundle</item>
-			<item>PropertyVetoException</item>
-			<item>ProtectionDomain</item>
-			<item>ProtocolException</item>
-			<item>Provider</item>
-			<item>Provider.Service</item>
-			<item>ProviderException</item>
-			<item>Proxy</item>
-			<item>Proxy</item>
-			<item>Proxy.Type</item>
-			<item>ProxySelector</item>
-			<item>PublicKey</item>
-			<item>PushbackInputStream</item>
-			<item>PushbackReader</item>
-			<item>QName</item>
-			<item>QuadCurve2D</item>
-			<item>QuadCurve2D.Double</item>
-			<item>QuadCurve2D.Float</item>
-			<item>Query</item>
-			<item>QueryEval</item>
-			<item>QueryExp</item>
-			<item>Queue</item>
-			<item>QueuedJobCount</item>
-			<item>RC2ParameterSpec</item>
-			<item>RC5ParameterSpec</item>
-			<item>REBIND</item>
-			<item>REQUEST_PROCESSING_POLICY_ID</item>
-			<item>RGBImageFilter</item>
-			<item>RMIClassLoader</item>
-			<item>RMIClassLoaderSpi</item>
-			<item>RMIClientSocketFactory</item>
-			<item>RMIConnection</item>
-			<item>RMIConnectionImpl</item>
-			<item>RMIConnectionImpl_Stub</item>
-			<item>RMIConnector</item>
-			<item>RMIConnectorServer</item>
-			<item>RMICustomMaxStreamFormat</item>
-			<item>RMIFailureHandler</item>
-			<item>RMIIIOPServerImpl</item>
-			<item>RMIJRMPServerImpl</item>
-			<item>RMISecurityException</item>
-			<item>RMISecurityManager</item>
-			<item>RMIServer</item>
-			<item>RMIServerImpl</item>
-			<item>RMIServerImpl_Stub</item>
-			<item>RMIServerSocketFactory</item>
-			<item>RMISocketFactory</item>
-			<item>RSAKey</item>
-			<item>RSAKeyGenParameterSpec</item>
-			<item>RSAMultiPrimePrivateCrtKey</item>
-			<item>RSAMultiPrimePrivateCrtKeySpec</item>
-			<item>RSAOtherPrimeInfo</item>
-			<item>RSAPrivateCrtKey</item>
-			<item>RSAPrivateCrtKeySpec</item>
-			<item>RSAPrivateKey</item>
-			<item>RSAPrivateKeySpec</item>
-			<item>RSAPublicKey</item>
-			<item>RSAPublicKeySpec</item>
-			<item>RTFEditorKit</item>
-			<item>Random</item>
-			<item>RandomAccess</item>
-			<item>RandomAccessFile</item>
-			<item>Raster</item>
-			<item>RasterFormatException</item>
-			<item>RasterOp</item>
-			<item>Rdn</item>
-			<item>ReadOnlyBufferException</item>
-			<item>ReadWriteLock</item>
-			<item>Readable</item>
-			<item>ReadableByteChannel</item>
-			<item>Reader</item>
-			<item>RealmCallback</item>
-			<item>RealmChoiceCallback</item>
-			<item>Receiver</item>
-			<item>Rectangle</item>
-			<item>Rectangle2D</item>
-			<item>Rectangle2D.Double</item>
-			<item>Rectangle2D.Float</item>
-			<item>RectangularShape</item>
-			<item>ReentrantLock</item>
-			<item>ReentrantReadWriteLock</item>
-			<item>ReentrantReadWriteLock.ReadLock</item>
-			<item>ReentrantReadWriteLock.WriteLock</item>
-			<item>Ref</item>
-			<item>RefAddr</item>
-			<item>Reference</item>
-			<item>Reference</item>
-			<item>ReferenceQueue</item>
-			<item>ReferenceUriSchemesSupported</item>
-			<item>Referenceable</item>
-			<item>ReferralException</item>
-			<item>ReflectPermission</item>
-			<item>ReflectionException</item>
-			<item>RefreshFailedException</item>
-			<item>Refreshable</item>
-			<item>Region</item>
-			<item>RegisterableService</item>
-			<item>Registry</item>
-			<item>RegistryHandler</item>
-			<item>RejectedExecutionException</item>
-			<item>RejectedExecutionHandler</item>
-			<item>Relation</item>
-			<item>RelationException</item>
-			<item>RelationNotFoundException</item>
-			<item>RelationNotification</item>
-			<item>RelationService</item>
-			<item>RelationServiceMBean</item>
-			<item>RelationServiceNotRegisteredException</item>
-			<item>RelationSupport</item>
-			<item>RelationSupportMBean</item>
-			<item>RelationType</item>
-			<item>RelationTypeNotFoundException</item>
-			<item>RelationTypeSupport</item>
-			<item>RemarshalException</item>
-			<item>Remote</item>
-			<item>RemoteCall</item>
-			<item>RemoteException</item>
-			<item>RemoteObject</item>
-			<item>RemoteObjectInvocationHandler</item>
-			<item>RemoteRef</item>
-			<item>RemoteServer</item>
-			<item>RemoteStub</item>
-			<item>RenderContext</item>
-			<item>RenderableImage</item>
-			<item>RenderableImageOp</item>
-			<item>RenderableImageProducer</item>
-			<item>RenderedImage</item>
-			<item>RenderedImageFactory</item>
-			<item>Renderer</item>
-			<item>RenderingHints</item>
-			<item>RenderingHints.Key</item>
-			<item>RepaintManager</item>
-			<item>ReplicateScaleFilter</item>
-			<item>RepositoryIdHelper</item>
-			<item>Request</item>
-			<item>RequestInfo</item>
-			<item>RequestInfoOperations</item>
-			<item>RequestProcessingPolicy</item>
-			<item>RequestProcessingPolicyOperations</item>
-			<item>RequestProcessingPolicyValue</item>
-			<item>RequestingUserName</item>
-			<item>RequiredModelMBean</item>
-			<item>RescaleOp</item>
-			<item>ResolutionSyntax</item>
-			<item>ResolveResult</item>
-			<item>Resolver</item>
-			<item>ResourceBundle</item>
-			<item>ResponseCache</item>
-			<item>ResponseHandler</item>
-			<item>Result</item>
-			<item>ResultSet</item>
-			<item>ResultSetMetaData</item>
-			<item>Retention</item>
-			<item>RetentionPolicy</item>
-			<item>ReverbType</item>
-			<item>Robot</item>
-			<item>Role</item>
-			<item>RoleInfo</item>
-			<item>RoleInfoNotFoundException</item>
-			<item>RoleList</item>
-			<item>RoleNotFoundException</item>
-			<item>RoleResult</item>
-			<item>RoleStatus</item>
-			<item>RoleUnresolved</item>
-			<item>RoleUnresolvedList</item>
-			<item>RootPaneContainer</item>
-			<item>RootPaneUI</item>
-			<item>RoundRectangle2D</item>
-			<item>RoundRectangle2D.Double</item>
-			<item>RoundRectangle2D.Float</item>
-			<item>RoundingMode</item>
-			<item>RowMapper</item>
-			<item>RowSet</item>
-			<item>RowSetEvent</item>
-			<item>RowSetInternal</item>
-			<item>RowSetListener</item>
-			<item>RowSetMetaData</item>
-			<item>RowSetMetaDataImpl</item>
-			<item>RowSetReader</item>
-			<item>RowSetWarning</item>
-			<item>RowSetWriter</item>
-			<item>RuleBasedCollator</item>
-			<item>RunTime</item>
-			<item>RunTimeOperations</item>
-			<item>Runnable</item>
-			<item>Runtime</item>
-			<item>RuntimeErrorException</item>
-			<item>RuntimeException</item>
-			<item>RuntimeMBeanException</item>
-			<item>RuntimeMXBean</item>
-			<item>RuntimeOperationsException</item>
-			<item>RuntimePermission</item>
-			<item>SAXException</item>
-			<item>SAXNotRecognizedException</item>
-			<item>SAXNotSupportedException</item>
-			<item>SAXParseException</item>
-			<item>SAXParser</item>
-			<item>SAXParserFactory</item>
-			<item>SAXResult</item>
-			<item>SAXSource</item>
-			<item>SAXTransformerFactory</item>
-			<item>SERVANT_RETENTION_POLICY_ID</item>
-			<item>SQLData</item>
-			<item>SQLException</item>
-			<item>SQLInput</item>
-			<item>SQLInputImpl</item>
-			<item>SQLOutput</item>
-			<item>SQLOutputImpl</item>
-			<item>SQLPermission</item>
-			<item>SQLWarning</item>
-			<item>SSLContext</item>
-			<item>SSLContextSpi</item>
-			<item>SSLEngine</item>
-			<item>SSLEngineResult</item>
-			<item>SSLEngineResult.HandshakeStatus</item>
-			<item>SSLEngineResult.Status</item>
-			<item>SSLException</item>
-			<item>SSLHandshakeException</item>
-			<item>SSLKeyException</item>
-			<item>SSLPeerUnverifiedException</item>
-			<item>SSLPermission</item>
-			<item>SSLProtocolException</item>
-			<item>SSLServerSocket</item>
-			<item>SSLServerSocketFactory</item>
-			<item>SSLSession</item>
-			<item>SSLSessionBindingEvent</item>
-			<item>SSLSessionBindingListener</item>
-			<item>SSLSessionContext</item>
-			<item>SSLSocket</item>
-			<item>SSLSocketFactory</item>
-			<item>SUCCESSFUL</item>
-			<item>SYNC_WITH_TRANSPORT</item>
-			<item>SYSTEM_EXCEPTION</item>
-			<item>SampleModel</item>
-			<item>Sasl</item>
-			<item>SaslClient</item>
-			<item>SaslClientFactory</item>
-			<item>SaslException</item>
-			<item>SaslServer</item>
-			<item>SaslServerFactory</item>
-			<item>Savepoint</item>
-			<item>Scanner</item>
-			<item>ScatteringByteChannel</item>
-			<item>ScheduledExecutorService</item>
-			<item>ScheduledFuture</item>
-			<item>ScheduledThreadPoolExecutor</item>
-			<item>Schema</item>
-			<item>SchemaFactory</item>
-			<item>SchemaFactoryLoader</item>
-			<item>SchemaViolationException</item>
-			<item>ScrollBarUI</item>
-			<item>ScrollPane</item>
-			<item>ScrollPaneAdjustable</item>
-			<item>ScrollPaneConstants</item>
-			<item>ScrollPaneLayout</item>
-			<item>ScrollPaneLayout.UIResource</item>
-			<item>ScrollPaneUI</item>
-			<item>Scrollable</item>
-			<item>Scrollbar</item>
-			<item>SealedObject</item>
-			<item>SearchControls</item>
-			<item>SearchResult</item>
-			<item>SecretKey</item>
-			<item>SecretKeyFactory</item>
-			<item>SecretKeyFactorySpi</item>
-			<item>SecretKeySpec</item>
-			<item>SecureCacheResponse</item>
-			<item>SecureClassLoader</item>
-			<item>SecureRandom</item>
-			<item>SecureRandomSpi</item>
-			<item>Security</item>
-			<item>SecurityException</item>
-			<item>SecurityManager</item>
-			<item>SecurityPermission</item>
-			<item>Segment</item>
-			<item>SelectableChannel</item>
-			<item>SelectionKey</item>
-			<item>Selector</item>
-			<item>SelectorProvider</item>
-			<item>Semaphore</item>
-			<item>SeparatorUI</item>
-			<item>Sequence</item>
-			<item>SequenceInputStream</item>
-			<item>Sequencer</item>
-			<item>Sequencer.SyncMode</item>
-			<item>SerialArray</item>
-			<item>SerialBlob</item>
-			<item>SerialClob</item>
-			<item>SerialDatalink</item>
-			<item>SerialException</item>
-			<item>SerialJavaObject</item>
-			<item>SerialRef</item>
-			<item>SerialStruct</item>
-			<item>Serializable</item>
-			<item>SerializablePermission</item>
-			<item>Servant</item>
-			<item>ServantActivator</item>
-			<item>ServantActivatorHelper</item>
-			<item>ServantActivatorOperations</item>
-			<item>ServantActivatorPOA</item>
-			<item>ServantAlreadyActive</item>
-			<item>ServantAlreadyActiveHelper</item>
-			<item>ServantLocator</item>
-			<item>ServantLocatorHelper</item>
-			<item>ServantLocatorOperations</item>
-			<item>ServantLocatorPOA</item>
-			<item>ServantManager</item>
-			<item>ServantManagerOperations</item>
-			<item>ServantNotActive</item>
-			<item>ServantNotActiveHelper</item>
-			<item>ServantObject</item>
-			<item>ServantRetentionPolicy</item>
-			<item>ServantRetentionPolicyOperations</item>
-			<item>ServantRetentionPolicyValue</item>
-			<item>ServerCloneException</item>
-			<item>ServerError</item>
-			<item>ServerException</item>
-			<item>ServerIdHelper</item>
-			<item>ServerNotActiveException</item>
-			<item>ServerRef</item>
-			<item>ServerRequest</item>
-			<item>ServerRequestInfo</item>
-			<item>ServerRequestInfoOperations</item>
-			<item>ServerRequestInterceptor</item>
-			<item>ServerRequestInterceptorOperations</item>
-			<item>ServerRuntimeException</item>
-			<item>ServerSocket</item>
-			<item>ServerSocketChannel</item>
-			<item>ServerSocketFactory</item>
-			<item>ServiceContext</item>
-			<item>ServiceContextHelper</item>
-			<item>ServiceContextHolder</item>
-			<item>ServiceContextListHelper</item>
-			<item>ServiceContextListHolder</item>
-			<item>ServiceDetail</item>
-			<item>ServiceDetailHelper</item>
-			<item>ServiceIdHelper</item>
-			<item>ServiceInformation</item>
-			<item>ServiceInformationHelper</item>
-			<item>ServiceInformationHolder</item>
-			<item>ServiceNotFoundException</item>
-			<item>ServicePermission</item>
-			<item>ServiceRegistry</item>
-			<item>ServiceRegistry.Filter</item>
-			<item>ServiceUI</item>
-			<item>ServiceUIFactory</item>
-			<item>ServiceUnavailableException</item>
-			<item>Set</item>
-			<item>SetOfIntegerSyntax</item>
-			<item>SetOverrideType</item>
-			<item>SetOverrideTypeHelper</item>
-			<item>Severity</item>
-			<item>Shape</item>
-			<item>ShapeGraphicAttribute</item>
-			<item>SheetCollate</item>
-			<item>Short</item>
-			<item>ShortBuffer</item>
-			<item>ShortBufferException</item>
-			<item>ShortHolder</item>
-			<item>ShortLookupTable</item>
-			<item>ShortMessage</item>
-			<item>ShortSeqHelper</item>
-			<item>ShortSeqHolder</item>
-			<item>Sides</item>
-			<item>Signature</item>
-			<item>SignatureException</item>
-			<item>SignatureSpi</item>
-			<item>SignedObject</item>
-			<item>Signer</item>
-			<item>SimpleAttributeSet</item>
-			<item>SimpleBeanInfo</item>
-			<item>SimpleDateFormat</item>
-			<item>SimpleDoc</item>
-			<item>SimpleFormatter</item>
-			<item>SimpleTimeZone</item>
-			<item>SimpleType</item>
-			<item>SinglePixelPackedSampleModel</item>
-			<item>SingleSelectionModel</item>
-			<item>Size2DSyntax</item>
-			<item>SizeLimitExceededException</item>
-			<item>SizeRequirements</item>
-			<item>SizeSequence</item>
-			<item>Skeleton</item>
-			<item>SkeletonMismatchException</item>
-			<item>SkeletonNotFoundException</item>
-			<item>SliderUI</item>
-			<item>Socket</item>
-			<item>SocketAddress</item>
-			<item>SocketChannel</item>
-			<item>SocketException</item>
-			<item>SocketFactory</item>
-			<item>SocketHandler</item>
-			<item>SocketImpl</item>
-			<item>SocketImplFactory</item>
-			<item>SocketOptions</item>
-			<item>SocketPermission</item>
-			<item>SocketSecurityException</item>
-			<item>SocketTimeoutException</item>
-			<item>SoftBevelBorder</item>
-			<item>SoftReference</item>
-			<item>SortControl</item>
-			<item>SortKey</item>
-			<item>SortResponseControl</item>
-			<item>SortedMap</item>
-			<item>SortedSet</item>
-			<item>SortingFocusTraversalPolicy</item>
-			<item>Soundbank</item>
-			<item>SoundbankReader</item>
-			<item>SoundbankResource</item>
-			<item>Source</item>
-			<item>SourceDataLine</item>
-			<item>SourceLocator</item>
-			<item>SpinnerDateModel</item>
-			<item>SpinnerListModel</item>
-			<item>SpinnerModel</item>
-			<item>SpinnerNumberModel</item>
-			<item>SpinnerUI</item>
-			<item>SplitPaneUI</item>
-			<item>Spring</item>
-			<item>SpringLayout</item>
-			<item>SpringLayout.Constraints</item>
-			<item>SslRMIClientSocketFactory</item>
-			<item>SslRMIServerSocketFactory</item>
-			<item>Stack</item>
-			<item>StackOverflowError</item>
-			<item>StackTraceElement</item>
-			<item>StandardMBean</item>
-			<item>StartTlsRequest</item>
-			<item>StartTlsResponse</item>
-			<item>State</item>
-			<item>StateEdit</item>
-			<item>StateEditable</item>
-			<item>StateFactory</item>
-			<item>Statement</item>
-			<item>Statement</item>
-			<item>StreamCorruptedException</item>
-			<item>StreamHandler</item>
-			<item>StreamPrintService</item>
-			<item>StreamPrintServiceFactory</item>
-			<item>StreamResult</item>
-			<item>StreamSource</item>
-			<item>StreamTokenizer</item>
-			<item>Streamable</item>
-			<item>StreamableValue</item>
-			<item>StrictMath</item>
-			<item>String</item>
-			<item>StringBuffer</item>
-			<item>StringBufferInputStream</item>
-			<item>StringBuilder</item>
-			<item>StringCharacterIterator</item>
-			<item>StringContent</item>
-			<item>StringHolder</item>
-			<item>StringIndexOutOfBoundsException</item>
-			<item>StringMonitor</item>
-			<item>StringMonitorMBean</item>
-			<item>StringNameHelper</item>
-			<item>StringReader</item>
-			<item>StringRefAddr</item>
-			<item>StringSelection</item>
-			<item>StringSeqHelper</item>
-			<item>StringSeqHolder</item>
-			<item>StringTokenizer</item>
-			<item>StringValueExp</item>
-			<item>StringValueHelper</item>
-			<item>StringWriter</item>
-			<item>Stroke</item>
-			<item>Struct</item>
-			<item>StructMember</item>
-			<item>StructMemberHelper</item>
-			<item>Stub</item>
-			<item>StubDelegate</item>
-			<item>StubNotFoundException</item>
-			<item>Style</item>
-			<item>StyleConstants</item>
-			<item>StyleConstants.CharacterConstants</item>
-			<item>StyleConstants.ColorConstants</item>
-			<item>StyleConstants.FontConstants</item>
-			<item>StyleConstants.ParagraphConstants</item>
-			<item>StyleContext</item>
-			<item>StyleSheet</item>
-			<item>StyleSheet.BoxPainter</item>
-			<item>StyleSheet.ListPainter</item>
-			<item>StyledDocument</item>
-			<item>StyledEditorKit</item>
-			<item>StyledEditorKit.AlignmentAction</item>
-			<item>StyledEditorKit.BoldAction</item>
-			<item>StyledEditorKit.FontFamilyAction</item>
-			<item>StyledEditorKit.FontSizeAction</item>
-			<item>StyledEditorKit.ForegroundAction</item>
-			<item>StyledEditorKit.ItalicAction</item>
-			<item>StyledEditorKit.StyledTextAction</item>
-			<item>StyledEditorKit.UnderlineAction</item>
-			<item>Subject</item>
-			<item>SubjectDelegationPermission</item>
-			<item>SubjectDomainCombiner</item>
-			<item>SupportedValuesAttribute</item>
-			<item>SuppressWarnings</item>
-			<item>SwingConstants</item>
-			<item>SwingPropertyChangeSupport</item>
-			<item>SwingUtilities</item>
-			<item>SyncFactory</item>
-			<item>SyncFactoryException</item>
-			<item>SyncFailedException</item>
-			<item>SyncProvider</item>
-			<item>SyncProviderException</item>
-			<item>SyncResolver</item>
-			<item>SyncScopeHelper</item>
-			<item>SynchronousQueue</item>
-			<item>SynthConstants</item>
-			<item>SynthContext</item>
-			<item>SynthGraphicsUtils</item>
-			<item>SynthLookAndFeel</item>
-			<item>SynthPainter</item>
-			<item>SynthStyle</item>
-			<item>SynthStyleFactory</item>
-			<item>Synthesizer</item>
-			<item>SysexMessage</item>
-			<item>System</item>
-			<item>SystemColor</item>
-			<item>SystemException</item>
-			<item>SystemFlavorMap</item>
-			<item>TAG_ALTERNATE_IIOP_ADDRESS</item>
-			<item>TAG_CODE_SETS</item>
-			<item>TAG_INTERNET_IOP</item>
-			<item>TAG_JAVA_CODEBASE</item>
-			<item>TAG_MULTIPLE_COMPONENTS</item>
-			<item>TAG_ORB_TYPE</item>
-			<item>TAG_POLICIES</item>
-			<item>TAG_RMI_CUSTOM_MAX_STREAM_FORMAT</item>
-			<item>TCKind</item>
-			<item>THREAD_POLICY_ID</item>
-			<item>TIMEOUT</item>
-			<item>TRANSACTION_MODE</item>
-			<item>TRANSACTION_REQUIRED</item>
-			<item>TRANSACTION_ROLLEDBACK</item>
-			<item>TRANSACTION_UNAVAILABLE</item>
-			<item>TRANSIENT</item>
-			<item>TRANSPORT_RETRY</item>
-			<item>TabExpander</item>
-			<item>TabSet</item>
-			<item>TabStop</item>
-			<item>TabableView</item>
-			<item>TabbedPaneUI</item>
-			<item>TableCellEditor</item>
-			<item>TableCellRenderer</item>
-			<item>TableColumn</item>
-			<item>TableColumnModel</item>
-			<item>TableColumnModelEvent</item>
-			<item>TableColumnModelListener</item>
-			<item>TableHeaderUI</item>
-			<item>TableModel</item>
-			<item>TableModelEvent</item>
-			<item>TableModelListener</item>
-			<item>TableUI</item>
-			<item>TableView</item>
-			<item>TabularData</item>
-			<item>TabularDataSupport</item>
-			<item>TabularType</item>
-			<item>TagElement</item>
-			<item>TaggedComponent</item>
-			<item>TaggedComponentHelper</item>
-			<item>TaggedComponentHolder</item>
-			<item>TaggedProfile</item>
-			<item>TaggedProfileHelper</item>
-			<item>TaggedProfileHolder</item>
-			<item>Target</item>
-			<item>TargetDataLine</item>
-			<item>TargetedNotification</item>
-			<item>Templates</item>
-			<item>TemplatesHandler</item>
-			<item>Text</item>
-			<item>TextAction</item>
-			<item>TextArea</item>
-			<item>TextAttribute</item>
-			<item>TextComponent</item>
-			<item>TextEvent</item>
-			<item>TextField</item>
-			<item>TextHitInfo</item>
-			<item>TextInputCallback</item>
-			<item>TextLayout</item>
-			<item>TextLayout.CaretPolicy</item>
-			<item>TextListener</item>
-			<item>TextMeasurer</item>
-			<item>TextOutputCallback</item>
-			<item>TextSyntax</item>
-			<item>TextUI</item>
-			<item>TexturePaint</item>
-			<item>Thread</item>
-			<item>Thread.State</item>
-			<item>Thread.UncaughtExceptionHandler</item>
-			<item>ThreadDeath</item>
-			<item>ThreadFactory</item>
-			<item>ThreadGroup</item>
-			<item>ThreadInfo</item>
-			<item>ThreadLocal</item>
-			<item>ThreadMXBean</item>
-			<item>ThreadPolicy</item>
-			<item>ThreadPolicyOperations</item>
-			<item>ThreadPolicyValue</item>
-			<item>ThreadPoolExecutor</item>
-			<item>ThreadPoolExecutor.AbortPolicy</item>
-			<item>ThreadPoolExecutor.CallerRunsPolicy</item>
-			<item>ThreadPoolExecutor.DiscardOldestPolicy</item>
-			<item>ThreadPoolExecutor.DiscardPolicy</item>
-			<item>Throwable</item>
-			<item>Tie</item>
-			<item>TileObserver</item>
-			<item>Time</item>
-			<item>TimeLimitExceededException</item>
-			<item>TimeUnit</item>
-			<item>TimeZone</item>
-			<item>TimeoutException</item>
-			<item>Timer</item>
-			<item>Timer</item>
-			<item>Timer</item>
-			<item>TimerAlarmClockNotification</item>
-			<item>TimerMBean</item>
-			<item>TimerNotification</item>
-			<item>TimerTask</item>
-			<item>Timestamp</item>
-			<item>Timestamp</item>
-			<item>TitledBorder</item>
-			<item>TooManyListenersException</item>
-			<item>ToolBarUI</item>
-			<item>ToolTipManager</item>
-			<item>ToolTipUI</item>
-			<item>Toolkit</item>
-			<item>Track</item>
-			<item>TransactionRequiredException</item>
-			<item>TransactionRolledbackException</item>
-			<item>TransactionService</item>
-			<item>TransactionalWriter</item>
-			<item>TransferHandler</item>
-			<item>Transferable</item>
-			<item>TransformAttribute</item>
-			<item>Transformer</item>
-			<item>TransformerConfigurationException</item>
-			<item>TransformerException</item>
-			<item>TransformerFactory</item>
-			<item>TransformerFactoryConfigurationError</item>
-			<item>TransformerHandler</item>
-			<item>Transmitter</item>
-			<item>Transparency</item>
-			<item>TreeCellEditor</item>
-			<item>TreeCellRenderer</item>
-			<item>TreeExpansionEvent</item>
-			<item>TreeExpansionListener</item>
-			<item>TreeMap</item>
-			<item>TreeModel</item>
-			<item>TreeModelEvent</item>
-			<item>TreeModelListener</item>
-			<item>TreeNode</item>
-			<item>TreePath</item>
-			<item>TreeSelectionEvent</item>
-			<item>TreeSelectionListener</item>
-			<item>TreeSelectionModel</item>
-			<item>TreeSet</item>
-			<item>TreeUI</item>
-			<item>TreeWillExpandListener</item>
-			<item>TrustAnchor</item>
-			<item>TrustManager</item>
-			<item>TrustManagerFactory</item>
-			<item>TrustManagerFactorySpi</item>
-			<item>Type</item>
-			<item>TypeCode</item>
-			<item>TypeCodeHolder</item>
-			<item>TypeInfo</item>
-			<item>TypeInfoProvider</item>
-			<item>TypeMismatch</item>
-			<item>TypeMismatch</item>
-			<item>TypeMismatch</item>
-			<item>TypeMismatchHelper</item>
-			<item>TypeMismatchHelper</item>
-			<item>TypeNotPresentException</item>
-			<item>TypeVariable</item>
-			<item>Types</item>
-			<item>UID</item>
-			<item>UIDefaults</item>
-			<item>UIDefaults.ActiveValue</item>
-			<item>UIDefaults.LazyInputMap</item>
-			<item>UIDefaults.LazyValue</item>
-			<item>UIDefaults.ProxyLazyValue</item>
-			<item>UIManager</item>
-			<item>UIManager.LookAndFeelInfo</item>
-			<item>UIResource</item>
-			<item>ULongLongSeqHelper</item>
-			<item>ULongLongSeqHolder</item>
-			<item>ULongSeqHelper</item>
-			<item>ULongSeqHolder</item>
-			<item>UNKNOWN</item>
-			<item>UNKNOWN</item>
-			<item>UNSUPPORTED_POLICY</item>
-			<item>UNSUPPORTED_POLICY_VALUE</item>
-			<item>URI</item>
-			<item>URIException</item>
-			<item>URIResolver</item>
-			<item>URISyntax</item>
-			<item>URISyntaxException</item>
-			<item>URL</item>
-			<item>URLClassLoader</item>
-			<item>URLConnection</item>
-			<item>URLDecoder</item>
-			<item>URLEncoder</item>
-			<item>URLStreamHandler</item>
-			<item>URLStreamHandlerFactory</item>
-			<item>URLStringHelper</item>
-			<item>USER_EXCEPTION</item>
-			<item>UShortSeqHelper</item>
-			<item>UShortSeqHolder</item>
-			<item>UTFDataFormatException</item>
-			<item>UUID</item>
-			<item>UndeclaredThrowableException</item>
-			<item>UndoManager</item>
-			<item>UndoableEdit</item>
-			<item>UndoableEditEvent</item>
-			<item>UndoableEditListener</item>
-			<item>UndoableEditSupport</item>
-			<item>UnexpectedException</item>
-			<item>UnicastRemoteObject</item>
-			<item>UnionMember</item>
-			<item>UnionMemberHelper</item>
-			<item>UnknownEncoding</item>
-			<item>UnknownEncodingHelper</item>
-			<item>UnknownError</item>
-			<item>UnknownException</item>
-			<item>UnknownFormatConversionException</item>
-			<item>UnknownFormatFlagsException</item>
-			<item>UnknownGroupException</item>
-			<item>UnknownHostException</item>
-			<item>UnknownHostException</item>
-			<item>UnknownObjectException</item>
-			<item>UnknownServiceException</item>
-			<item>UnknownUserException</item>
-			<item>UnknownUserExceptionHelper</item>
-			<item>UnknownUserExceptionHolder</item>
-			<item>UnmappableCharacterException</item>
-			<item>UnmarshalException</item>
-			<item>UnmodifiableClassException</item>
-			<item>UnmodifiableSetException</item>
-			<item>UnrecoverableEntryException</item>
-			<item>UnrecoverableKeyException</item>
-			<item>Unreferenced</item>
-			<item>UnresolvedAddressException</item>
-			<item>UnresolvedPermission</item>
-			<item>UnsatisfiedLinkError</item>
-			<item>UnsolicitedNotification</item>
-			<item>UnsolicitedNotificationEvent</item>
-			<item>UnsolicitedNotificationListener</item>
-			<item>UnsupportedAddressTypeException</item>
-			<item>UnsupportedAudioFileException</item>
-			<item>UnsupportedCallbackException</item>
-			<item>UnsupportedCharsetException</item>
-			<item>UnsupportedClassVersionError</item>
-			<item>UnsupportedEncodingException</item>
-			<item>UnsupportedFlavorException</item>
-			<item>UnsupportedLookAndFeelException</item>
-			<item>UnsupportedOperationException</item>
-			<item>UserDataHandler</item>
-			<item>UserException</item>
-			<item>Util</item>
-			<item>UtilDelegate</item>
-			<item>Utilities</item>
-			<item>VMID</item>
-			<item>VM_ABSTRACT</item>
-			<item>VM_CUSTOM</item>
-			<item>VM_NONE</item>
-			<item>VM_TRUNCATABLE</item>
-			<item>Validator</item>
-			<item>ValidatorHandler</item>
-			<item>ValueBase</item>
-			<item>ValueBaseHelper</item>
-			<item>ValueBaseHolder</item>
-			<item>ValueExp</item>
-			<item>ValueFactory</item>
-			<item>ValueHandler</item>
-			<item>ValueHandlerMultiFormat</item>
-			<item>ValueInputStream</item>
-			<item>ValueMember</item>
-			<item>ValueMemberHelper</item>
-			<item>ValueOutputStream</item>
-			<item>VariableHeightLayoutCache</item>
-			<item>Vector</item>
-			<item>VerifyError</item>
-			<item>VersionSpecHelper</item>
-			<item>VetoableChangeListener</item>
-			<item>VetoableChangeListenerProxy</item>
-			<item>VetoableChangeSupport</item>
-			<item>View</item>
-			<item>ViewFactory</item>
-			<item>ViewportLayout</item>
-			<item>ViewportUI</item>
-			<item>VirtualMachineError</item>
-			<item>Visibility</item>
-			<item>VisibilityHelper</item>
-			<item>VoiceStatus</item>
-			<item>Void</item>
-			<item>VolatileImage</item>
-			<item>WCharSeqHelper</item>
-			<item>WCharSeqHolder</item>
-			<item>WStringSeqHelper</item>
-			<item>WStringSeqHolder</item>
-			<item>WStringValueHelper</item>
-			<item>WeakHashMap</item>
-			<item>WeakReference</item>
-			<item>WebRowSet</item>
-			<item>WildcardType</item>
-			<item>Window</item>
-			<item>WindowAdapter</item>
-			<item>WindowConstants</item>
-			<item>WindowEvent</item>
-			<item>WindowFocusListener</item>
-			<item>WindowListener</item>
-			<item>WindowStateListener</item>
-			<item>WrappedPlainView</item>
-			<item>WritableByteChannel</item>
-			<item>WritableRaster</item>
-			<item>WritableRenderedImage</item>
-			<item>WriteAbortedException</item>
-			<item>Writer</item>
-			<item>WrongAdapter</item>
-			<item>WrongAdapterHelper</item>
-			<item>WrongPolicy</item>
-			<item>WrongPolicyHelper</item>
-			<item>WrongTransaction</item>
-			<item>WrongTransactionHelper</item>
-			<item>WrongTransactionHolder</item>
-			<item>X500Principal</item>
-			<item>X500PrivateCredential</item>
-			<item>X509CRL</item>
-			<item>X509CRLEntry</item>
-			<item>X509CRLSelector</item>
-			<item>X509CertSelector</item>
-			<item>X509Certificate</item>
-			<item>X509Certificate</item>
-			<item>X509EncodedKeySpec</item>
-			<item>X509ExtendedKeyManager</item>
-			<item>X509Extension</item>
-			<item>X509KeyManager</item>
-			<item>X509TrustManager</item>
-			<item>XAConnection</item>
-			<item>XADataSource</item>
-			<item>XAException</item>
-			<item>XAResource</item>
-			<item>XMLConstants</item>
-			<item>XMLDecoder</item>
-			<item>XMLEncoder</item>
-			<item>XMLFilter</item>
-			<item>XMLFilterImpl</item>
-			<item>XMLFormatter</item>
-			<item>XMLGregorianCalendar</item>
-			<item>XMLParseException</item>
-			<item>XMLReader</item>
-			<item>XMLReaderAdapter</item>
-			<item>XMLReaderFactory</item>
-			<item>XPath</item>
-			<item>XPathConstants</item>
-			<item>XPathException</item>
-			<item>XPathExpression</item>
-			<item>XPathExpressionException</item>
-			<item>XPathFactory</item>
-			<item>XPathFactoryConfigurationException</item>
-			<item>XPathFunction</item>
-			<item>XPathFunctionException</item>
-			<item>XPathFunctionResolver</item>
-			<item>XPathVariableResolver</item>
-			<item>Xid</item>
-			<item>XmlReader</item>
-			<item>XmlWriter</item>
-			<item>ZipEntry</item>
-			<item>ZipException</item>
-			<item>ZipFile</item>
-			<item>ZipInputStream</item>
-			<item>ZipOutputStream</item>
-			<item>ZoneView</item>
-			<item>_BindingIteratorImplBase</item>
-			<item>_BindingIteratorStub</item>
-			<item>_DynAnyFactoryStub</item>
-			<item>_DynAnyStub</item>
-			<item>_DynArrayStub</item>
-			<item>_DynEnumStub</item>
-			<item>_DynFixedStub</item>
-			<item>_DynSequenceStub</item>
-			<item>_DynStructStub</item>
-			<item>_DynUnionStub</item>
-			<item>_DynValueStub</item>
-			<item>_IDLTypeStub</item>
-			<item>_NamingContextExtStub</item>
-			<item>_NamingContextImplBase</item>
-			<item>_NamingContextStub</item>
-			<item>_PolicyStub</item>
-			<item>_Remote_Stub</item>
-			<item>_ServantActivatorStub</item>
-			<item>_ServantLocatorStub</item>
-
-<!-- 			new classes of jdk 6.0 -->
-
-			<item>AbstractAnnotationValueVisitor6</item>
-			<item>AbstractElementVisitor6</item>
-			<item>AbstractMarshallerImpl</item>
-			<item>AbstractOwnableSynchronizer</item>
-			<item>AbstractProcessor</item>
-			<item>AbstractQueuedLongSynchronizer</item>
-			<item>AbstractScriptEngine</item>
-			<item>AbstractTypeVisitor6</item>
-			<item>AbstractUnmarshallerImpl</item>
-			<item>ActivationDataFlavor</item>
-			<item>AlgorithmMethod</item>
-			<item>AnnotationMirror</item>
-			<item>AnnotationValue</item>
-			<item>AnnotationValueVisitor</item>
-			<item>ArrayDeque</item>
-			<item>AsyncHandler</item>
-			<item>AttachmentMarshaller</item>
-			<item>AttachmentPart</item>
-			<item>AttachmentUnmarshaller</item>
-			<item>Binder</item>
-			<item>BindingProvider</item>
-			<item>Bindings</item>
-			<item>BlockingDeque</item>
-			<item>BreakIteratorProvider</item>
-			<item>C14NMethodParameterSpec</item>
-			<item>CanonicalizationMethod</item>
-			<item>Characters</item>
-			<item>ClientInfoStatus</item>
-			<item>CollapsedStringAdapter</item>
-			<item>CollatorProvider</item>
-			<item>CommandInfo</item>
-			<item>CommandMap</item>
-			<item>CommandObject</item>
-			<item>CommonDataSource</item>
-			<item>Compilable</item>
-			<item>CompiledScript</item>
-			<item>Completion</item>
-			<item>Completions</item>
-			<item>CompositeDataInvocationHandler</item>
-			<item>CompositeDataView</item>
-			<item>ConcurrentNavigableMap</item>
-			<item>ConcurrentSkipListMap</item>
-			<item>ConcurrentSkipListSet</item>
-			<item>ConfigurationSpi</item>
-			<item>Console</item>
-			<item>ConstructorProperties</item>
-			<item>CookieManager</item>
-			<item>CookiePolicy</item>
-			<item>CookieStore</item>
-			<item>CurrencyNameProvider</item>
-			<item>Data</item>
-			<item>DataContentHandler</item>
-			<item>DataContentHandlerFactory</item>
-			<item>DataHandler</item>
-			<item>DatatypeConverter</item>
-			<item>DatatypeConverterInterface</item>
-			<item>DateFormatProvider</item>
-			<item>DateFormatSymbolsProvider</item>
-			<item>DecimalFormatSymbolsProvider</item>
-			<item>DeclaredType</item>
-			<item>DefaultRowSorter</item>
-			<item>DefaultValidationEventHandler</item>
-			<item>DeflaterInputStream</item>
-			<item>Deque</item>
-			<item>DescriptorKey</item>
-			<item>DescriptorRead</item>
-			<item>Desktop</item>
-			<item>Detail</item>
-			<item>DetailEntry</item>
-			<item>Diagnostic</item>
-			<item>DiagnosticCollector</item>
-			<item>DiagnosticListener</item>
-			<item>DigestMethod</item>
-			<item>DigestMethodParameterSpec</item>
-			<item>Dispatch</item>
-			<item>DOMCryptoContext</item>
-			<item>DomHandler</item>
-			<item>DOMSignContext</item>
-			<item>DOMStructure</item>
-			<item>DOMURIReference</item>
-			<item>DOMValidateContext</item>
-			<item>DropMode</item>
-			<item>ElementFilter</item>
-			<item>ElementKind</item>
-			<item>ElementKindVisitor6</item>
-			<item>Elements</item>
-			<item>ElementScanner6</item>
-			<item>ElementVisitor</item>
-			<item>EndDocument</item>
-			<item>EndElement</item>
-			<item>Endpoint</item>
-			<item>EntityDeclaration</item>
-			<item>ErrorType</item>
-			<item>EventException</item>
-			<item>EventFilter</item>
-			<item>EventReaderDelegate</item>
-			<item>EventTarget</item>
-			<item>ExcC14NParameterSpec</item>
-			<item>ExecutableElement</item>
-			<item>ExecutableType</item>
-			<item>FileDataSource</item>
-			<item>FileNameExtensionFilter</item>
-			<item>FileObject</item>
-			<item>Filer</item>
-			<item>FilerException</item>
-			<item>FileTypeMap</item>
-			<item>ForwardingFileObject</item>
-			<item>ForwardingJavaFileManager</item>
-			<item>ForwardingJavaFileObject</item>
-			<item>Generated</item>
-			<item>GridBagLayoutInfo</item>
-			<item>GroupLayout</item>
-			<item>HandlerChain</item>
-			<item>HandlerResolver</item>
-			<item>HexBinaryAdapter</item>
-			<item>HMACParameterSpec</item>
-			<item>Holder</item>
-			<item>HTTPBinding</item>
-			<item>HttpCookie</item>
-			<item>HTTPException</item>
-			<item>IDN</item>
-			<item>ImmutableDescriptor</item>
-			<item>InflaterOutputStream</item>
-			<item>InitParam</item>
-			<item>InterfaceAddress</item>
-			<item>Invocable</item>
-			<item>IOError</item>
-			<item>JavaCompiler</item>
-			<item>JavaFileManager</item>
-			<item>JavaFileObject</item>
-			<item>JAXBContext</item>
-			<item>JAXBElement</item>
-			<item>JAXBException</item>
-			<item>JAXBIntrospector</item>
-			<item>JAXBResult</item>
-			<item>JAXBSource</item>
-			<item>JMX</item>
-			<item>JMXAddressable</item>
-			<item>KeyInfo</item>
-			<item>KeyInfoFactory</item>
-			<item>KeyName</item>
-			<item>KeySelector</item>
-			<item>KeySelectorException</item>
-			<item>KeySelectorResult</item>
-			<item>KeyValue</item>
-			<item>LayoutPath</item>
-			<item>LayoutStyle</item>
-			<item>LinearGradientPaint</item>
-			<item>LinkedBlockingDeque</item>
-			<item>LocaleNameProvider</item>
-			<item>LocaleServiceProvider</item>
-			<item>Location</item>
-			<item>LockInfo</item>
-			<item>LogicalHandler</item>
-			<item>LogicalMessage</item>
-			<item>LogicalMessageContext</item>
-			<item>MailcapCommandMap</item>
-			<item>Marshaller</item>
-			<item>MessageContext</item>
-			<item>MessageFactory</item>
-			<item>Messager</item>
-			<item>MimeHeader</item>
-			<item>MimeHeaders</item>
-			<item>MimeType</item>
-			<item>MimeTypeParameterList</item>
-			<item>MimetypesFileTypeMap</item>
-			<item>MirroredTypeException</item>
-			<item>MirroredTypesException</item>
-			<item>MLetContent</item>
-			<item>MonitorInfo</item>
-			<item>MultipleGradientPaint</item>
-			<item>MutationEvent</item>
-			<item>MXBean</item>
-			<item>Namespace</item>
-			<item>NavigableMap</item>
-			<item>NavigableSet</item>
-			<item>NClob</item>
-			<item>NestingKind</item>
-			<item>NodeSetData</item>
-			<item>NormalizedStringAdapter</item>
-			<item>Normalizer</item>
-			<item>NoSuchMechanismException</item>
-			<item>NotationDeclaration</item>
-			<item>NotIdentifiableEvent</item>
-			<item>NotIdentifiableEventImpl</item>
-			<item>NoType</item>
-			<item>NullType</item>
-			<item>NumberFormatProvider</item>
-			<item>OctetStreamData</item>
-			<item>Oneway</item>
-			<item>OptionChecker</item>
-			<item>PackageElement</item>
-			<item>ParseConversionEvent</item>
-			<item>ParseConversionEventImpl</item>
-			<item>Path2D</item>
-			<item>PGPData</item>
-			<item>PolicySpi</item>
-			<item>PortInfo</item>
-			<item>PostConstruct</item>
-			<item>PreDestroy</item>
-			<item>PrimitiveType</item>
-			<item>PrintConversionEvent</item>
-			<item>PrintConversionEventImpl</item>
-			<item>ProcessingEnvironment</item>
-			<item>Processor</item>
-			<item>PropertyException</item>
-			<item>RadialGradientPaint</item>
-			<item>ReferenceType</item>
-			<item>RequestWrapper</item>
-			<item>Resource</item>
-			<item>Resources</item>
-			<item>Response</item>
-			<item>ResponseWrapper</item>
-			<item>RetrievalMethod</item>
-			<item>RoundEnvironment</item>
-			<item>RowFilter</item>
-			<item>RowId</item>
-			<item>RowIdLifetime</item>
-			<item>RowSorter</item>
-			<item>RowSorterEvent</item>
-			<item>RowSorterListener</item>
-			<item>RunnableFuture</item>
-			<item>RunnableScheduledFuture</item>
-			<item>SAAJMetaFactory</item>
-			<item>SAAJResult</item>
-			<item>SchemaOutputResolver</item>
-			<item>ScriptContext</item>
-			<item>ScriptEngine</item>
-			<item>ScriptEngineFactory</item>
-			<item>ScriptEngineManager</item>
-			<item>ScriptException</item>
-			<item>Service</item>
-			<item>ServiceConfigurationError</item>
-			<item>ServiceDelegate</item>
-			<item>ServiceLoader</item>
-			<item>ServiceMode</item>
-			<item>SignatureMethod</item>
-			<item>SignatureMethodParameterSpec</item>
-			<item>SignatureProperties</item>
-			<item>SignatureProperty</item>
-			<item>SignedInfo</item>
-			<item>SimpleAnnotationValueVisitor6</item>
-			<item>SimpleBindings</item>
-			<item>SimpleElementVisitor6</item>
-			<item>SimpleJavaFileObject</item>
-			<item>SimpleScriptContext</item>
-			<item>SimpleTypeVisitor6</item>
-			<item>SOAPBinding</item>
-			<item>SOAPBinding</item>
-			<item>SOAPBody</item>
-			<item>SOAPBodyElement</item>
-			<item>SOAPConnection</item>
-			<item>SOAPConnectionFactory</item>
-			<item>SOAPConstants</item>
-			<item>SOAPElement</item>
-			<item>SOAPElementFactory</item>
-			<item>SOAPEnvelope</item>
-			<item>SOAPException</item>
-			<item>SOAPFactory</item>
-			<item>SOAPFault</item>
-			<item>SOAPFaultElement</item>
-			<item>SOAPFaultException</item>
-			<item>SOAPHandler</item>
-			<item>SOAPHeader</item>
-			<item>SOAPHeaderElement</item>
-			<item>SOAPMessage</item>
-			<item>SOAPMessageContext</item>
-			<item>SOAPMessageHandler</item>
-			<item>SOAPMessageHandlers</item>
-			<item>SOAPPart</item>
-			<item>SortOrder</item>
-			<item>SourceVersion</item>
-			<item>SplashScreen</item>
-			<item>SQLClientInfoException</item>
-			<item>SQLDataException</item>
-			<item>SQLFeatureNotSupportedException</item>
-			<item>SQLIntegrityConstraintViolationException</item>
-			<item>SQLInvalidAuthorizationSpecException</item>
-			<item>SQLNonTransientConnectionException</item>
-			<item>SQLNonTransientException</item>
-			<item>SQLRecoverableException</item>
-			<item>SQLSyntaxErrorException</item>
-			<item>SQLTimeoutException</item>
-			<item>SQLTransactionRollbackException</item>
-			<item>SQLTransientConnectionException</item>
-			<item>SQLTransientException</item>
-			<item>SQLXML</item>
-			<item>SSLParameters</item>
-			<item>StandardEmitterMBean</item>
-			<item>StandardJavaFileManager</item>
-			<item>StandardLocation</item>
-			<item>StartDocument</item>
-			<item>StartElement</item>
-			<item>StatementEvent</item>
-			<item>StatementEventListener</item>
-			<item>StAXResult</item>
-			<item>StAXSource</item>
-			<item>StreamFilter</item>
-			<item>StreamReaderDelegate</item>
-			<item>SupportedAnnotationTypes</item>
-			<item>SupportedOptions</item>
-			<item>SupportedSourceVersion</item>
-			<item>SwingWorker</item>
-			<item>SystemTray</item>
-			<item>TableRowSorter</item>
-			<item>TableStringConverter</item>
-			<item>TimeZoneNameProvider</item>
-			<item>Tool</item>
-			<item>ToolProvider</item>
-			<item>Transform</item>
-			<item>TransformException</item>
-			<item>TransformParameterSpec</item>
-			<item>TransformService</item>
-			<item>TrayIcon</item>
-			<item>TypeConstraintException</item>
-			<item>TypeElement</item>
-			<item>TypeKind</item>
-			<item>TypeKindVisitor6</item>
-			<item>TypeMirror</item>
-			<item>TypeParameterElement</item>
-			<item>TypeVisitor</item>
-			<item>UIEvent</item>
-			<item>UnknownAnnotationValueException</item>
-			<item>UnknownElementException</item>
-			<item>UnknownTypeException</item>
-			<item>Unmarshaller</item>
-			<item>UnmarshallerHandler</item>
-			<item>UnsupportedDataTypeException</item>
-			<item>URIDereferencer</item>
-			<item>URIParameter</item>
-			<item>URIReference</item>
-			<item>URIReferenceException</item>
-			<item>URLDataSource</item>
-			<item>ValidationEvent</item>
-			<item>ValidationEventCollector</item>
-			<item>ValidationEventHandler</item>
-			<item>ValidationEventImpl</item>
-			<item>ValidationEventLocator</item>
-			<item>ValidationEventLocatorImpl</item>
-			<item>ValidationException</item>
-			<item>VariableElement</item>
-			<item>W3CDomHandler</item>
-			<item>WebEndpoint</item>
-			<item>WebFault</item>
-			<item>WebMethod</item>
-			<item>WebParam</item>
-			<item>WebResult</item>
-			<item>WebService</item>
-			<item>WebServiceClient</item>
-			<item>WebServiceContext</item>
-			<item>WebServiceException</item>
-			<item>WebServicePermission</item>
-			<item>WebServiceProvider</item>
-			<item>WebServiceRef</item>
-			<item>WebServiceRefs</item>
-			<item>Wrapper</item>
-			<item>X509Data</item>
-			<item>X509IssuerSerial</item>
-			<item>XmlAccessOrder</item>
-			<item>XmlAccessorOrder</item>
-			<item>XmlAccessorType</item>
-			<item>XmlAccessType</item>
-			<item>XmlAdapter</item>
-			<item>XmlAnyAttribute</item>
-			<item>XmlAnyElement</item>
-			<item>XmlAttachmentRef</item>
-			<item>XmlAttribute</item>
-			<item>XMLCryptoContext</item>
-			<item>XmlElement</item>
-			<item>XmlElementDecl</item>
-			<item>XmlElementRef</item>
-			<item>XmlElementRefs</item>
-			<item>XmlElements</item>
-			<item>XmlElementWrapper</item>
-			<item>XmlEnum</item>
-			<item>XmlEnumValue</item>
-			<item>XMLEvent</item>
-			<item>XMLEventAllocator</item>
-			<item>XMLEventConsumer</item>
-			<item>XMLEventFactory</item>
-			<item>XMLEventReader</item>
-			<item>XMLEventWriter</item>
-			<item>XmlID</item>
-			<item>XmlIDREF</item>
-			<item>XmlInlineBinaryData</item>
-			<item>XMLInputFactory</item>
-			<item>XmlJavaTypeAdapter</item>
-			<item>XmlJavaTypeAdapters</item>
-			<item>XmlList</item>
-			<item>XmlMimeType</item>
-			<item>XmlMixed</item>
-			<item>XmlNs</item>
-			<item>XmlNsForm</item>
-			<item>XMLObject</item>
-			<item>XMLOutputFactory</item>
-			<item>XmlRegistry</item>
-			<item>XMLReporter</item>
-			<item>XMLResolver</item>
-			<item>XmlRootElement</item>
-			<item>XmlSchema</item>
-			<item>XmlSchemaType</item>
-			<item>XmlSchemaTypes</item>
-			<item>XMLSignature</item>
-			<item>XMLSignatureException</item>
-			<item>XMLSignatureFactory</item>
-			<item>XMLSignContext</item>
-			<item>XMLStreamConstants</item>
-			<item>XMLStreamException</item>
-			<item>XMLStreamReader</item>
-			<item>XMLStreamWriter</item>
-			<item>XMLStructure</item>
-			<item>XmlTransient</item>
-			<item>XmlType</item>
-			<item>XMLValidateContext</item>
-			<item>XmlValue</item>
-			<item>XPathFilter2ParameterSpec</item>
-			<item>XPathFilterParameterSpec</item>
-			<item>XPathType</item>
-			<item>XSLTTransformParameterSpec</item>
-			<item>ZipError</item>
-
-<!-- 			end new classes -->
-		</list>
-		<list name="keywords">
-            <item>as</item>
-            <item>in</item>
-
-			<item>abstract</item>
-			<item>break</item>
-			<item>case</item>
-			<item>catch</item>
-			<item>class</item>
-			<item>continue</item>
-			<item>default</item>
-			<item>do</item>
-			<item>else</item>
-			<item>enum</item>
-			<item>extends</item>
-			<item>false</item>
-			<item>finally</item>
-			<item>for</item>
-			<item>goto</item>
-			<item>if</item>
-			<item>implements</item>
-			<item>instanceof</item>
-			<item>@interface</item>
-			<item>interface</item>
-			<item>native</item>
-			<item>new</item>
-			<item>null</item>
-			<item>private</item>
-			<item>protected</item>
-			<item>public</item>
-			<item>return</item>
-			<item>super</item>
-			<item>strictfp</item>
-			<item>switch</item>
-			<item>synchronized</item>
-			<item>this</item>
-			<item>throws</item>
-			<item>throw</item>
-			<item>transient</item>
-			<item>true</item>
-			<item>try</item>
-			<item>volatile</item>
-			<item>while</item>
-		</list>
-		<list name="types">
-            <item>def</item>
-
-			<item>boolean</item>
-			<item>byte</item>
-			<item>char</item>
-			<item>const</item>
-			<item>double</item>
-			<item>final</item>
-			<item>float</item>
-			<item>int</item>
-			<item>long</item>
-			<item>short</item>
-			<item>static</item>
-			<item>void</item>
-		</list>
-		<contexts>
-			<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-				<!-- Comment next line if you don't use Javadoc tool -->
-				<IncludeRules context="##Javadoc"/>
-				<keyword attribute="Keyword" context="#stay" String="keywords"/>
-				<keyword attribute="Data Type" context="#stay" String="types"/>
-				<keyword attribute="Java15" context="#stay" String="java15"/>
-				<Float attribute="Float" context="Float Suffixes"/>
-				<HlCOct attribute="Octal" context="#stay"/>
-				<HlCHex attribute="Hex" context="#stay"/>
-				<Int attribute="Decimal" context="Int Suffixes"/>
-				<HlCChar attribute="Char" context="#stay"/>
-				<RegExpr attribute="Char" context="#stay" String="'\\u[0-9a-fA-F]{4}'"/>
-				<RegExpr attribute="Decimal" context="#stay" String="//\s*BEGIN.*$" beginRegion="Region1"/>
-				<RegExpr attribute="Decimal" context="#stay" String="//\s*END.*$" endRegion="Region1"/>
-                <StringDetect attribute="String" String="&apos;&apos;&apos;" context="MultiLineSingleString" beginRegion="MultiLineString"/>
-                <StringDetect attribute="String" String="&quot;&quot;&quot;" context="MultiLineDoubleString" beginRegion="MultiLineString"/>
-                <DetectChar attribute="String" context="SingleString" char="&apos;"/>
-                <DetectChar attribute="String" context="String" char="&quot;"/>
-				<RegExpr attribute="Function" context="EnterPrintf" String="\.(format|printf)\b"/>
-				<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
-				<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
-				<DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1"/>
-				<DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"/>
-				<RegExpr attribute="Keyword" context="#stay" String="\.{3,3}\s+" />
-				<RegExpr attribute="Keyword" context="StaticImports" String="\b(import\s+static)\b" />
-				<RegExpr attribute="Keyword" context="Imports" String="\b(package|import)\b" />
-				<RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*(/\*\s*\d+\s*\*/\s*)?[(])" />
-				<DetectChar attribute="Symbol" context="Member" char="." />
-				<DetectChar attribute="Symbol" context="InFunctionCall" char="("/>
-				<AnyChar attribute="Symbol" context="#stay" String=":!%&amp;+,-/*&lt;=&gt;?[]|~^&#59;"/>
-			</context>
-            <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-                <AnyChar String="fF" attribute="Float" context="#pop"/>
-            </context>
-            <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-                <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
-                <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
-            </context>
-			<context attribute="Normal Text" lineEndContext="#stay" name="InFunctionCall">
-				<IncludeRules context="Normal"/>
-				<DetectChar attribute="Symbol" context="#pop" char=")"/>
-			</context>
-			<context attribute="String" lineEndContext="#pop" name="String">
-				<LineContinue attribute="String" context="#stay"/>
-				<HlCStringChar attribute="String Char" context="#stay"/>
-				<RegExpr attribute="String Char" context="#stay" String="\\u[0-9a-fA-F]{4}"/>
-				<DetectChar attribute="String" context="#pop" char="&quot;"/>
-			</context>
-            <context attribute="String" lineEndContext="#pop" name="SingleString">
-                <DetectChar attribute="String" context="#pop" char="&apos;"/>
-            </context>
-            <context attribute="String" lineEndContext="#stay" name="MultiLineSingleString">
-                <StringDetect attribute="String" context="#pop" String="&apos;&apos;&apos;" endRegion="MultiLineString"/>
-            </context>
-            <context attribute="String" lineEndContext="#stay" name="MultiLineDoubleString">
-                <StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;" endRegion="MultiLineString"/>
-            </context>
-			<context attribute="Normal Text" lineEndContext="#stay" name="EnterPrintf" fallthrough="true" fallthroughContext="#pop">
-				<DetectChar attribute="Symbol" context="Printf" char="("/>
-				<DetectSpaces attribute="Normal Text" context="#stay"/>
-			</context>
-			<context attribute="Normal Text" lineEndContext="#stay" name="Printf">
-				<DetectChar attribute="String" context="PrintfString" char="&quot;"/>
-				<IncludeRules context="InFunctionCall"/>
-			</context>
-			<context attribute="PrintfString" lineEndContext="#pop" name="PrintfString">
-				<LineContinue attribute="String" context="#stay"/>
-				<HlCStringChar attribute="String Char" context="#stay"/>
-				<DetectChar attribute="String" context="#pop" char="&quot;"/>
-				<RegExpr attribute="String Char" context="#stay" String="%(\d+\$)?(-|#|\+|\ |0|,|\()*\d*(\.\d+)?[a-hosxA-CEGHSX]" />
-				<RegExpr attribute="String Char" context="#stay" String="%(\d+\$)?(-|#|\+|\ |0|,|\()*\d*(t|T)(a|A|b|B|c|C|d|D|e|F|h|H|I|j|k|l|L|m|M|N|p|P|Q|r|R|s|S|T|y|Y|z|Z)" />
-				<RegExpr attribute="String Char" context="#stay" String="%(%|n)" />
-			</context>
-			<context attribute="Normal Text" lineEndContext="#pop" name="Member" fallthrough="true" fallthroughContext="#pop">
-				<RegExpr attribute="Function" context="#pop" String="\b[_a-zA-Z]\w*(?=[\s]*)" />
-			</context>
-			<context attribute="Normal Text" lineEndContext="#pop" name="StaticImports">
-				<RegExpr attribute="StaticImports" context="#pop" String="\s*.*;?" />
-			</context>
-			<context attribute="Normal Text" lineEndContext="#pop" name="Imports">
-				<RegExpr attribute="Imports" context="#pop" String="\s*.*;?" />
-			</context>
-			<context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
-				<DetectSpaces />
-				<IncludeRules context="##Comments"/>
-			</context>
-			<context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
-				<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
-				<DetectSpaces />
-				<IncludeRules context="##Comments"/>
-			</context>
-		</contexts>
-		<itemDatas>
-			<itemData name="Normal Text"  defStyleNum="dsNormal"/>
-			<itemData name="Keyword"      defStyleNum="dsKeyword"/>
-			<itemData name="Function"     defStyleNum="dsFunction"/>
-			<itemData name="StaticImports" defStyleNum="dsImport"/>
-			<itemData name="Imports"      defStyleNum="dsImport"/>
-			<itemData name="Data Type"    defStyleNum="dsDataType"/>
-			<itemData name="Decimal"      defStyleNum="dsDecVal"/>
-			<itemData name="Octal"        defStyleNum="dsBaseN"/>
-			<itemData name="Hex"          defStyleNum="dsBaseN"/>
-			<itemData name="Float"        defStyleNum="dsFloat"/>
-			<itemData name="Char"         defStyleNum="dsChar"/>
-			<itemData name="String"       defStyleNum="dsString"/>
-			<itemData name="String Char"  defStyleNum="dsSpecialChar"/>
-			<itemData name="PrintfString" defStyleNum="dsString"/>
-			<itemData name="Comment"      defStyleNum="dsComment"/>
-			<itemData name="Symbol"       defStyleNum="dsNormal"/>
-			<itemData name="Java15"       defStyleNum="dsBuiltIn" bold="1" italic="0"/>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+	<!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)">
+	<!ENTITY hex "(?:[0-9a-fA-F]++(_++[0-9a-fA-F]++)*+)">
+	<!ENTITY exp "(?:[eE][-+]?&int;)">
+	<!ENTITY float "(\b&int;(\.((&int;&exp;?+|&exp;)[fFdD]?\b|[dDfFgG]\b)?|&exp;[fFdD]?\b|[dDfFgG]\b)|\.&int;&exp;?[dDfFgG]?\b)">
+	<!ENTITY hexfloat "\b0[xX](&hex;\.?+&hex;?+|\.&hex;?)[pP][-+]?&int;[dDfFgG]?\b">
+]>
+<!--
+    Based on the java syntax file 1.19 by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)
+-->
+<language name="Groovy" version="11" kateversion="5.62" section="Sources" extensions="*.groovy;*.gradle;*.gvy;Jenkinsfile" license="LGPL" author="Chris Reeves (chris@ev-soft.net)">
+	<highlighting>
+		<list name="java15">
+			<include>java15##Java</include>
+		</list>
+		<list name="keywords">
+			<item>as</item>
+			<item>assert</item>
+			<item>class</item>
+			<item>default</item>
+			<item>enum</item>
+			<item>extends</item>
+			<item>false</item>
+			<item>implements</item>
+			<item>import</item>
+			<item>in</item>
+			<item>instanceof</item>
+			<item>native</item>
+			<item>abstract</item>
+			<item>interface</item>
+			<item>new</item>
+			<item>null</item>
+			<item>package</item>
+			<item>super</item>
+			<item>this</item>
+			<item>throws</item>
+			<item>trait</item>
+			<item>true</item>
+			<item>var</item>
+		</list>
+		<list name="control flow">
+			<item>break</item>
+			<item>case</item>
+			<item>catch</item>
+			<item>continue</item>
+			<item>do</item>
+			<item>else</item>
+			<item>finally</item>
+			<item>for</item>
+			<item>goto</item>
+			<item>if</item>
+			<item>return</item>
+			<item>switch</item>
+			<item>throw</item>
+			<item>try</item>
+			<item>while</item>
+		</list>
+		<list name="types">
+			<item>def</item>
+
+			<item>boolean</item>
+			<item>byte</item>
+			<item>char</item>
+			<item>double</item>
+			<item>float</item>
+			<item>int</item>
+			<item>long</item>
+			<item>short</item>
+			<item>void</item>
+		</list>
+		<contexts>
+			<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+				<DetectSpaces context="#stay"/>
+
+				<DetectChar attribute="Symbol" context="Dot" char="." lookAhead="1"/>
+				<DetectChar attribute="Symbol" context="AfterSymbol" char="{" beginRegion="Brace1"/>
+				<DetectChar attribute="Symbol" context="AfterSymbol" char="}" endRegion="Brace1"/>
+
+				<!-- Comment next line if you don't use Javadoc tool -->
+				<IncludeRules context="##Javadoc"/>
+				<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+				<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+
+				<AnyChar attribute="Symbol" context="AfterSymbol" String="()[]&amp;|+,-/*&lt;=&gt;;!%?:~^"/>
+
+				<AnyChar context="Number" String="0123456789" lookAhead="1"/>
+
+				<DetectChar attribute="String" context="StringSQ" char="'"/>
+				<DetectChar attribute="String" context="StringDQ" char="&quot;"/>
+				<Detect2Chars attribute="String" context="StringDollarSlashy" char="$" char1="/"/>
+
+				<keyword attribute="Keyword" context="#stay" String="keywords"/>
+				<keyword attribute="Control Flow" context="#stay" String="control flow"/>
+				<keyword attribute="Data Type" context="#stay" String="types"/>
+				<keyword attribute="Java15" context="#stay" String="java15"/>
+
+				<RegExpr attribute="Function" context="#stay" String="\b[_a-zA-Z]\w*(?=[\s]*(/\*\s*\d+\s*\*/\s*)?[(])" />
+				<DetectIdentifier attribute="Normal Text"/>
+			</context>
+
+			<context attribute="Normal Text" lineEndContext="#stay" name="Dot">
+				<IncludeRules context="FindFloat"/>
+				<DetectChar attribute="Symbol" context="#pop!Member" char="." />
+			</context>
+			<context attribute="Normal Text" lineEndContext="#stay" name="Member" fallthroughContext="#pop">
+				<DetectSpaces attribute="Normal Text" context="#stay"/>
+				<RegExpr attribute="Function" context="#pop" String="\b[_a-zA-Z]\w*(?=[\s]*(/\*\s*\d+\s*\*/\s*)?[({'&quot;])" />
+				<Detect2Chars attribute="Comment" context="#pop!Commentar 1" char="/" char1="/"/>
+				<DetectChar attribute="String" context="#pop!StringSlashy" char="/"/>
+			</context>
+
+			<context attribute="Normal Text" lineEndContext="#stay" name="AfterSymbol" fallthroughContext="#pop">
+				<DetectSpaces attribute="Normal Text" context="#stay"/>
+				<Detect2Chars attribute="Comment" context="#pop!Commentar 1" char="/" char1="/"/>
+				<DetectChar attribute="String" context="#pop!StringSlashy" char="/"/>
+			</context>
+
+			<context attribute="Normal Text" lineEndContext="#stay" name="Number">
+				<IncludeRules context="FindFloat"/>
+				<RegExpr attribute="Hex" context="#pop" String="\b0[xX]&hex;[lL]?\b"/>
+				<RegExpr attribute="Binary" context="#pop" String="\b0[bB][01]++(_++[01]++)*+[gGiIlL]?\b"/>
+				<RegExpr attribute="Octal" context="#pop" String="\b0_*+[0-7]++(_++[0-7_]++)*+[gGiIlL]?\b"/>
+				<RegExpr attribute="Decimal" context="#pop" String="\b(0|[1-9][0-9]*+(_++[0-9_]++)*+)[gGiIlL]?\b"/>
+				<AnyChar attribute="Error" context="#pop" String="0123456789"/>
+			</context>
+			<context attribute="Normal Text" lineEndContext="#stay" name="FindFloat">
+				<RegExpr attribute="Float" context="#pop" String="&float;|&hexfloat;"/>
+			</context>
+
+			<context attribute="String" lineEndContext="#pop" name="StringSQ" fallthroughContext="#pop!StringInSQ">
+				<Detect2Chars attribute="String" context="#pop!String3SQ" char="'" char1="'"/>
+				<DetectChar attribute="String" context="#pop" char="'"/>
+			</context>
+			<context attribute="String" lineEndContext="#pop" name="StringInSQ">
+				<DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+				<DetectChar attribute="String" context="#pop" char="'"/>
+			</context>
+			<context attribute="String" lineEndContext="#pop!StringIn3SQ" name="String3SQ" fallthroughContext="#pop!StringIn3SQ">
+				<LineContinue attribute="Symbol" context="#pop!StringIn3SQ" char="\"/>
+			</context>
+			<context attribute="String" lineEndContext="#stay" name="StringIn3SQ">
+				<DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+				<StringDetect attribute="String" context="#pop" String="'''"/>
+			</context>
+
+			<context attribute="String" lineEndContext="#pop" name="StringDQ" fallthroughContext="#pop!StringInDQ">
+				<Detect2Chars attribute="String" context="#pop!String3DQ" char="&quot;" char1="&quot;"/>
+				<DetectChar attribute="String" context="#pop" char="&quot;"/>
+			</context>
+			<context attribute="String" lineEndContext="#pop" name="StringInDQ">
+				<DetectChar attribute="String Interpolation" context="Interpolation" char="$"/>
+				<DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+				<DetectChar attribute="String" context="#pop" char="&quot;"/>
+			</context>
+			<context attribute="String" lineEndContext="#pop!StringIn3DQ" name="String3DQ" fallthroughContext="#pop!StringIn3DQ">
+				<LineContinue attribute="Symbol" context="#pop!StringIn3DQ" char="\"/>
+			</context>
+			<context attribute="String" lineEndContext="#stay" name="StringIn3DQ">
+				<DetectChar attribute="String Interpolation" context="Interpolation" char="$"/>
+				<DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+				<StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;"/>
+			</context>
+
+			<context attribute="String" lineEndContext="#stay" name="StringSlashy">
+				<DetectChar attribute="String Interpolation" context="Interpolation" char="$"/>
+				<DetectChar context="StringSlashyEscapedChar" char="\" lookAhead="1"/>
+				<DetectChar attribute="String" context="#pop" char="/"/>
+			</context>
+			<context attribute="String" lineEndContext="#pop" name="StringSlashyEscapedChar">
+				<Detect2Chars attribute="String" context="#pop" char="\" char1="/"/>
+				<IncludeRules context="StringEscapedChar"/>
+			</context>
+
+			<context attribute="String" lineEndContext="#stay" name="StringDollarSlashy">
+				<DetectChar context="InterpolationDollarSlashy" char="$" lookAhead="1"/>
+				<Detect2Chars attribute="String" context="#pop" char="/" char1="$"/>
+			</context>
+			<context attribute="String" lineEndContext="#stay" name="InterpolationDollarSlashy">
+				<Detect2Chars attribute="String Interpolation" context="#pop!InInterpolation" char="$" char1="{"/>
+				<Detect2Chars attribute="String Char" context="#pop" char="$" char1="$"/>
+				<Detect2Chars attribute="String Char" context="#pop" char="$" char1="/"/>
+				<RegExpr attribute="String Interpolation" context="#pop!InterpolationIdent" String="\$[_a-zA-Z]\w*" />
+				<DetectChar attribute="String" context="#pop" char="$"/>
+			</context>
+
+			<context attribute="String" lineEndContext="#stay" name="Interpolation" fallthroughContext="#pop">
+				<DetectChar attribute="String Interpolation" context="#pop!InInterpolation" char="{"/>
+				<DetectIdentifier attribute="String Interpolation" context="#pop!InterpolationIdent"/>
+			</context>
+			<context attribute="String Interpolation" lineEndContext="#stay" name="InInterpolation">
+				<DetectChar attribute="String Interpolation" context="#pop" char="}"/>
+				<IncludeRules context="Normal"/>
+			</context>
+			<context attribute="String Interpolation" lineEndContext="#pop" name="InterpolationIdent" fallthroughContext="#pop">
+				<DetectChar attribute="Symbol" context="InterpolationMember" char="."/>
+			</context>
+			<context attribute="String Interpolation" lineEndContext="#stay" name="InterpolationMember" fallthroughContext="#pop#pop">
+				<DetectIdentifier attribute="String Interpolation" context="#pop"/>
+			</context>
+
+			<context attribute="String" lineEndContext="#pop" name="StringEscapedChar">
+				<HlCStringChar attribute="String Char" context="#pop"/>
+				<RegExpr attribute="String Char" context="#pop" String="\\u[0-9a-fA-F]{4}"/>
+				<RegExpr attribute="Error" context="#pop" String="\\(u[0-9a-fA-F]*|.)?"/>
+			</context>
+
+			<context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+				<DetectSpaces />
+				<IncludeRules context="##Comments"/>
+			</context>
+			<context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
+				<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+				<DetectSpaces />
+				<IncludeRules context="##Comments"/>
+			</context>
+
+		</contexts>
+		<itemDatas>
+			<itemData name="Normal Text"  defStyleNum="dsNormal"/>
+			<itemData name="Keyword"      defStyleNum="dsKeyword"/>
+			<itemData name="Control Flow" defStyleNum="dsControlFlow" spellChecking="false"/>
+			<itemData name="Function"     defStyleNum="dsFunction"/>
+			<itemData name="Data Type"    defStyleNum="dsDataType"/>
+			<itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
+			<itemData name="Octal"        defStyleNum="dsBaseN" spellChecking="false"/>
+			<itemData name="Hex"          defStyleNum="dsBaseN" spellChecking="false"/>
+			<itemData name="Binary"       defStyleNum="dsBaseN" spellChecking="false"/>
+			<itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
+			<itemData name="String"       defStyleNum="dsString"/>
+			<itemData name="String Char"  defStyleNum="dsSpecialChar"/>
+			<itemData name="String Interpolation" defStyleNum="dsSpecialString"/>
+			<itemData name="Comment"      defStyleNum="dsComment"/>
+			<itemData name="Symbol"       defStyleNum="dsOperator"/>
+			<itemData name="Java15"       defStyleNum="dsBuiltIn" bold="1" italic="0"/>
+			<itemData name="Error"       defStyleNum="dsError" spellChecking="false"/>
 		</itemDatas>
 	</highlighting>
 	<general>
diff --git a/xml/hamlet.xml b/xml/hamlet.xml
--- a/xml/hamlet.xml
+++ b/xml/hamlet.xml
@@ -5,7 +5,7 @@
   word character *or* a number, hence the lookahead -->
   <!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
 ]>
-<language name="Hamlet" version="5" kateversion="2.4" section="Markup" extensions="*.hamlet" author="Bastian Holst (bastianholst@gmx.de)" license="LGPL" indenter="haskell">
+<language name="Hamlet" version="5" kateversion="5.53" section="Markup" extensions="*.hamlet" author="Bastian Holst (bastianholst@gmx.de)" license="LGPL" indenter="haskell">
 <highlighting>
 <contexts>
   <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
diff --git a/xml/haskell.xml b/xml/haskell.xml
--- a/xml/haskell.xml
+++ b/xml/haskell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Haskell" version="16" kateversion="5.0" section="Sources" extensions="*.hs;*.chs;*.hs-boot" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell" style="haskell">
+<language name="Haskell" version="16" 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">
   <highlighting>
   <list name="keywords">
     <item>case</item>
diff --git a/xml/haxe.xml b/xml/haxe.xml
--- a/xml/haxe.xml
+++ b/xml/haxe.xml
@@ -12,7 +12,7 @@
   ========================================================================
 -->
 
-<language name="Haxe" section="Sources" extensions="*.hx;*.Hx;*.hX;*.HX;" mimetype="text/x-hxsrc" version="4" kateversion="2.4" casesensitive="true" author="Chad Joan" license="MIT">
+<language name="Haxe" section="Sources" extensions="*.hx;*.Hx;*.hX;*.HX;" mimetype="text/x-hxsrc" version="4" kateversion="5.0" casesensitive="true" author="Chad Joan" license="MIT">
   <highlighting>
     <list name="keywords">
     
diff --git a/xml/idris.xml b/xml/idris.xml
--- a/xml/idris.xml
+++ b/xml/idris.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- Based on haskell.xml and idris.vim (https://github.com/idris-hackers/idris-vim/blob/6bdb44b85406b75e3b3a4fa265deab1dbe8c6ff1/syntax/idris.vim) -->
-<language name="Idris" version="5" kateversion="3.4" section="Sources" extensions="*.idr" author="Alexander Shabalin" license="LGPL">
+<language name="Idris" version="5" kateversion="5.0" section="Sources" extensions="*.idr" author="Alexander Shabalin" license="LGPL">
   <highlighting>
   <list name="keywords">
     <item>abstract</item>
@@ -101,7 +101,7 @@
            String="\|\|\|(?=[^\-!#\$%&amp;\*\+/&lt;=&gt;\?&#92;@\^\|~\.:]|$)" />
         <Detect2Chars attribute="Comment" context="block comment" char="{" char1="-" beginRegion="BlockComment" />
         <RegExpr attribute="Normal" context="declaration" lookAhead="true"
-           String="^\s*([a-z]+\s+)*([A-Za-z][A-Za-z0-9_]*'*|\([\-!#\$%&amp;\*\+\./&lt;=&gt;\?@&#92;\^\|~:]+\))\s*:" />
+           String="^\s*(?:[a-z]+\s+)*(?:[A-Za-z][A-Za-z0-9_]*'*|\([\-!#\$%&amp;\*\+\./&lt;=&gt;\?@&#92;\^\|~:]+\))\s*:" column="0" />
         <keyword attribute="Keyword" context="#stay" String="keywords" />
         <DetectChar attribute="Keyword" context="directive" char="%" />
         <keyword attribute="Tactic" context="#stay" String="tactics" />
diff --git a/xml/ini.xml b/xml/ini.xml
--- a/xml/ini.xml
+++ b/xml/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="7" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="7" kateversion="5.0" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
 
 <highlighting>
 <list name="keywords">
diff --git a/xml/j.xml b/xml/j.xml
--- a/xml/j.xml
+++ b/xml/j.xml
@@ -63,7 +63,7 @@
 <language name="J"
           section="Scripts"
           version="4"
-          kateversion="3.4"
+          kateversion="5.0"
           extensions="*.ijs;*.ijt;*.IJS;*.IJT"
           mimetype="text/x-j;text/x-jsrc"
           author="Igor Zhuravlov (zhuravlov.ip@ya.ru), greg heil (gheil.j@gmail.com)"
@@ -74,7 +74,7 @@
       <context attribute="Sentence" lineEndContext="#pop" name="sentence">
         <DetectSpaces/>
         <RegExpr      attribute="Foldable"       context="#stay"        String=":\s*0|\bdefine\b" beginRegion="Fold"/>
-        <RegExpr      attribute="Foldable"       context="#stay"        String="^\)$" endRegion="Fold"/>
+        <RegExpr      attribute="Foldable"       context="#stay"        String="^\)$" endRegion="Fold" column="0"/>
         <StringDetect attribute="Comment"        context="#stay"        String="NB.(" beginRegion="Fold"/>
         <StringDetect attribute="Comment"        context="#stay"        String="NB.)" endRegion="Fold"/>
         <StringDetect attribute="Comment"        context="comment line" String="NB."/>
diff --git a/xml/java.xml b/xml/java.xml
--- a/xml/java.xml
+++ b/xml/java.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
-	<!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 exp "(?:[eE][-+]?&int;)">
+	<!ENTITY float "(\b&int;(\.((&int;&exp;?+|&exp;)[fFdD]?\b|[fFdD]\b)?|&exp;[fFdD]?\b|[fFdD]\b)|\.&int;&exp;?[fFdD]?\b)">
+	<!ENTITY hexfloat "\b0[xX](&hex;\.?+&hex;?+|\.&hex;?)[pP][-+]?&int;[fFdD]?\b">
 ]>
-<language name="Java" version="8" kateversion="5.0" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Java" version="9" kateversion="5.62" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<list name="java15">
 			<item>ACTIVE</item>
@@ -3704,21 +3707,11 @@
 		</list>
 		<list name="keywords">
 			<item>abstract</item>
-			<item>break</item>
-			<item>case</item>
-			<item>catch</item>
 			<item>class</item>
-			<item>continue</item>
 			<item>default</item>
-			<item>do</item>
-			<item>else</item>
 			<item>enum</item>
 			<item>extends</item>
 			<item>false</item>
-			<item>finally</item>
-			<item>for</item>
-			<item>goto</item>
-			<item>if</item>
 			<item>implements</item>
 			<item>instanceof</item>
 			<item>@interface</item>
@@ -3729,18 +3722,30 @@
 			<item>private</item>
 			<item>protected</item>
 			<item>public</item>
-			<item>return</item>
 			<item>super</item>
 			<item>strictfp</item>
-			<item>switch</item>
 			<item>synchronized</item>
 			<item>this</item>
 			<item>throws</item>
-			<item>throw</item>
 			<item>transient</item>
 			<item>true</item>
-			<item>try</item>
 			<item>volatile</item>
+		</list>
+		<list name="control flow">
+			<item>break</item>
+			<item>case</item>
+			<item>catch</item>
+			<item>continue</item>
+			<item>do</item>
+			<item>else</item>
+			<item>finally</item>
+			<item>for</item>
+			<item>goto</item>
+			<item>if</item>
+			<item>return</item>
+			<item>switch</item>
+			<item>throw</item>
+			<item>try</item>
 			<item>while</item>
 		</list>
 		<list name="types">
@@ -3759,72 +3764,112 @@
 		</list>
 		<contexts>
 			<context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+				<DetectSpaces context="#stay"/>
+
+				<DetectChar attribute="Symbol" context="Dot" char="." lookAhead="1"/>
+				<DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1"/>
+				<DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"/>
+				<DetectChar attribute="Annotation" context="Annotation" char="@" />
+				<DetectChar attribute="Symbol" context="InFunctionCall" char="("/>
+
 				<!-- Comment next line if you don't use Javadoc tool -->
 				<IncludeRules context="##Javadoc"/>
+				<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+				<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+
+				<AnyChar attribute="Symbol" context="#stay" String="[]&amp;|+,-/*&lt;=&gt;;!%?:~^"/>
+
+				<AnyChar context="Number" String="0123456789" lookAhead="1"/>
+
+				<DetectChar attribute="String" context="String" char="&quot;"/>
+				<DetectChar context="Char" char="'" lookAhead="1"/>
+
 				<keyword attribute="Keyword" context="#stay" String="keywords"/>
+				<keyword attribute="Control Flow" context="#stay" String="control flow"/>
 				<keyword attribute="Data Type" context="#stay" String="types"/>
 				<keyword attribute="Java15" context="#stay" String="java15"/>
-				<RegExpr attribute="Float" context="#stay" String="(\b&int;\.?|(\b&int;)?\.&int;)([eE][\-\+]?&int;[fFdD]?|[fFdD])\b"/>
-				<RegExpr attribute="Float" context="#stay" String="(\b&int;\.|(\b&int;)?\.&int;\b)"/>
-				<RegExpr attribute="Float" context="#stay" String="\b0[xX](&hex;\.?|(&hex;)?\.&hex;)[pP][\-\+]?&int;[fFdD]?\b"/>
-				<RegExpr attribute="Hex" context="#stay" String="\b0[xX]&hex;[lL]?\b"/>
-				<RegExpr attribute="Binary" context="#stay" String="\b0[bB][01]([01_]*[01])?[lL]?\b"/>
-				<RegExpr attribute="Octal" context="#stay" String="\b0[0-7]([0-7_]*[0-7])?[lL]?\b"/>
-				<RegExpr attribute="Decimal" context="#stay" String="\b(0|[1-9]([0-9_]*[0-9])?)[lL]?\b"/>
-				<HlCChar attribute="Char" context="#stay"/>
-				<RegExpr attribute="Char" context="#stay" String="'\\u[0-9a-fA-F]{4}'"/>
-				<RegExpr attribute="Decimal" context="#stay" String="//\s*BEGIN.*$" beginRegion="Region1"/>
-				<RegExpr attribute="Decimal" context="#stay" String="//\s*END.*$" endRegion="Region1"/>
-				<DetectChar attribute="String" context="String" char="&quot;"/>
-				<RegExpr attribute="Function" context="EnterPrintf" String="\.(format|printf)\b"/>
-				<Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
-				<Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
-				<DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1"/>
-				<DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"/>
-				<RegExpr attribute="Keyword" context="#stay" String="\.{3,3}\s+" />
-				<RegExpr attribute="Keyword" context="StaticImports" String="\b(import\s+static)\b" />
-				<RegExpr attribute="Keyword" context="Imports" String="\b(package|import)\b" />
-				<RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*(/\*\s*\d+\s*\*/\s*)?[(])" />
-				<RegExpr attribute="Annotation" context="#stay" String="@[_\w][_\w\d]*" />
-				<DetectChar attribute="Symbol" context="Member" char="." />
-				<DetectChar attribute="Symbol" context="InFunctionCall" char="("/>
-				<AnyChar attribute="Symbol" context="#stay" String=":!%&amp;+,-/*&lt;=&gt;?[]|~^&#59;"/>
+
+				<WordDetect attribute="Keyword" context="Imports" String="package" />
+				<WordDetect attribute="Keyword" context="ImportsOrStaticImports" String="import" />
+
+				<RegExpr attribute="Function" context="#stay" String="\b[_a-zA-Z]\w*(?=[\s]*(/\*\s*\d+\s*\*/\s*)?[(])" />
+				<DetectIdentifier attribute="Normal Text"/>
 			</context>
+
+			<context attribute="Normal Text" lineEndContext="#stay" name="Number">
+				<IncludeRules context="FindFloat"/>
+				<RegExpr attribute="Hex" context="#pop" String="\b0[xX]&hex;[lL]?\b"/>
+				<RegExpr attribute="Binary" context="#pop" String="\b0[bB][01]++(_++[01]++)*+[lL]?\b"/>
+				<RegExpr attribute="Octal" context="#pop" String="\b0_*+[0-7]++(_++[0-7_]++)*+[lL]?\b"/>
+				<RegExpr attribute="Decimal" context="#pop" String="\b(0|[1-9][0-9]*+(_++[0-9_]++)*+)[lL]?\b"/>
+				<AnyChar attribute="Error" context="#pop" String="0123456789"/>
+			</context>
+			<context attribute="Normal Text" lineEndContext="#stay" name="FindFloat">
+				<RegExpr attribute="Float" context="#pop" String="&float;|&hexfloat;"/>
+			</context>
+
+			<context attribute="Normal Text" lineEndContext="#stay" name="Char">
+				<HlCChar attribute="Char" context="#pop"/>
+				<RegExpr attribute="Char" context="#pop" String="'\\u+[0-9a-fA-F]{4}'"/>
+				<RegExpr attribute="Error" context="#pop" String="'(\\(u+[0-9a-fA-F]*|.))?'?"/>
+			</context>
+
 			<context attribute="Normal Text" lineEndContext="#stay" name="InFunctionCall">
 				<IncludeRules context="Normal"/>
 				<DetectChar attribute="Symbol" context="#pop" char=")"/>
 			</context>
+
 			<context attribute="String" lineEndContext="#pop" name="String">
-				<LineContinue attribute="String" context="#stay"/>
-				<HlCStringChar attribute="String Char" context="#stay"/>
-				<RegExpr attribute="String Char" context="#stay" String="\\u[0-9a-fA-F]{4}"/>
+				<DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
 				<DetectChar attribute="String" context="#pop" char="&quot;"/>
 			</context>
-			<context attribute="Normal Text" lineEndContext="#stay" name="EnterPrintf" fallthrough="true" fallthroughContext="#pop">
-				<DetectChar attribute="Symbol" context="Printf" char="("/>
+			<context attribute="String" lineEndContext="#pop" name="StringEscapedChar">
+				<HlCStringChar attribute="String Char" context="#pop"/>
+				<RegExpr attribute="String Char" context="#pop" String="\\u+[0-9a-fA-F]{4}"/>
+				<RegExpr attribute="Error" context="#pop" String="\\(u+[0-9a-fA-F]*|.)?"/>
+			</context>
+
+			<context attribute="Normal Text" lineEndContext="#stay" name="Printf" fallthroughContext="#pop">
+				<DetectChar attribute="Symbol" context="#pop!InPrintf" char="("/>
 				<DetectSpaces attribute="Normal Text" context="#stay"/>
 			</context>
-			<context attribute="Normal Text" lineEndContext="#stay" name="Printf">
+			<context attribute="Normal Text" lineEndContext="#stay" name="InPrintf">
 				<DetectChar attribute="String" context="PrintfString" char="&quot;"/>
 				<IncludeRules context="InFunctionCall"/>
 			</context>
 			<context attribute="PrintfString" lineEndContext="#pop" name="PrintfString">
-				<LineContinue attribute="String" context="#stay"/>
-				<HlCStringChar attribute="String Char" context="#stay"/>
-				<DetectChar attribute="String" context="#pop" char="&quot;"/>
-				<RegExpr attribute="String Char" context="#stay" String="%(\d+\$)?(-|#|\+|\ |0|,|\()*\d*(\.\d+)?[a-hosxA-CEGHSX]" />
-				<RegExpr attribute="String Char" context="#stay" String="%(\d+\$)?(-|#|\+|\ |0|,|\()*\d*(t|T)(a|A|b|B|c|C|d|D|e|F|h|H|I|j|k|l|L|m|M|N|p|P|Q|r|R|s|S|T|y|Y|z|Z)" />
-				<RegExpr attribute="String Char" context="#stay" String="%(%|n)" />
+				<IncludeRules context="String"/>
+				<RegExpr attribute="String Char" context="#stay" String="%((\d+\$)?[-#+ 0,(]*\d*((\.\d+)?[a-hosxA-CEGHSX]|[tT][aAbBcCdDeFhHIjklLmMNpPQrRsSTyYzZ])|[%n])" />
 			</context>
-			<context attribute="Normal Text" lineEndContext="#pop" name="Member" fallthrough="true" fallthroughContext="#pop">
-				<RegExpr attribute="Function" context="#pop" String="\b[_a-zA-Z]\w*(?=[\s]*)" />
+
+			<context attribute="Normal Text" lineEndContext="#stay" name="Dot">
+				<StringDetect attribute="Keyword" context="#pop" String="..." />
+				<IncludeRules context="FindFloat"/>
+				<DetectChar attribute="Symbol" context="#pop!Member" char="." />
 			</context>
-			<context attribute="Normal Text" lineEndContext="#pop" name="StaticImports">
-				<RegExpr attribute="StaticImports" context="#pop" String="\s*.*;" />
+			<context attribute="Normal Text" lineEndContext="#stay" name="Member" fallthroughContext="#pop">
+				<DetectSpaces attribute="Normal Text" context="#stay"/>
+				<WordDetect attribute="Function" context="#pop!Printf" String="printf"/>
+				<WordDetect attribute="Function" context="#pop!Printf" String="format"/>
+				<DetectIdentifier attribute="Function" context="#pop"/>
 			</context>
-			<context attribute="Normal Text" lineEndContext="#pop" name="Imports">
-				<RegExpr attribute="Imports" context="#pop" String="\s*.*;" />
+
+			<context attribute="Normal Text" lineEndContext="#pop" name="Annotation" fallthroughContext="#pop">
+				<DetectIdentifier attribute="Annotation" context="#pop"/>
 			</context>
+
+			<context attribute="Normal Text" lineEndContext="#pop" name="ImportsOrStaticImports" fallthroughContext="#pop!Imports">
+				<DetectSpaces attribute="Normal Text"/>
+				<WordDetect attribute="Keyword" context="#pop!StaticImports" String="static"/>
+			</context>
+			<context attribute="StaticImports" lineEndContext="#pop" name="StaticImports">
+				<IncludeRules context="Imports"/>
+			</context>
+			<context attribute="Imports" lineEndContext="#pop" name="Imports">
+				<AnyChar attribute="Symbol" context="#stay" String=".*"/>
+				<DetectChar attribute="Symbol" context="#pop" char=";"/>
+			</context>
+
 			<context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
 				<DetectSpaces />
 				<IncludeRules context="##Comments"/>
@@ -3834,10 +3879,12 @@
 				<DetectSpaces />
 				<IncludeRules context="##Comments"/>
 			</context>
+
 		</contexts>
 		<itemDatas>
 			<itemData name="Normal Text"  defStyleNum="dsNormal" spellChecking="false"/>
 			<itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false"/>
+			<itemData name="Control Flow" defStyleNum="dsControlFlow" spellChecking="false"/>
 			<itemData name="Annotation"   defStyleNum="dsAttribute" spellChecking="false"/>
 			<itemData name="Function"     defStyleNum="dsFunction" spellChecking="false"/>
 			<itemData name="StaticImports" defStyleNum="dsImport" spellChecking="false"/>
@@ -3853,8 +3900,9 @@
 			<itemData name="String Char"  defStyleNum="dsSpecialChar" spellChecking="false"/>
 			<itemData name="PrintfString" defStyleNum="dsString"/>
 			<itemData name="Comment"      defStyleNum="dsComment"/>
-			<itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false"/>
+			<itemData name="Symbol"       defStyleNum="dsOperator" spellChecking="false"/>
 			<itemData name="Java15"       defStyleNum="dsBuiltIn" spellChecking="false"/>
+			<itemData name="Error"       defStyleNum="dsError" spellChecking="false"/>
 		</itemDatas>
 	</highlighting>
 	<general>
diff --git a/xml/javadoc.xml b/xml/javadoc.xml
--- a/xml/javadoc.xml
+++ b/xml/javadoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Javadoc" version="5" kateversion="5.0" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Javadoc" version="6" kateversion="5.62" section="Markup" extensions="" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<contexts>
 			<context name="Start" attribute="Normal Text" lineEndContext="#stay">
@@ -12,74 +12,52 @@
 			</context>
 			<context attribute="JavadocFS" lineEndContext="#stay" name="JavadocFSar">
 				<Detect2Chars attribute="JavadocFS" context="#pop" char="*" char1="/" endRegion="Javadoc"/>
-				<RegExpr attribute="JavadocFS" context="Javadocar" String="(!|\?)" />
-				<RegExpr attribute="JavadocFS" context="Javadocar" String="(\.\s*$)" />
-				<RegExpr attribute="JavadocFS" context="Javadocar" String="(\.\s)(?![\da-z])" />
-				<RegExpr attribute="JavadocFS" context="Javadocar" String="\**\s*(?=@(author|deprecated|exception|param|return|see|serial|serialData|serialField|since|throws|version)(\s|$))" firstNonSpace="true"/>
-				<StringDetect attribute="InlineTag" context="LiteralTagar" String="{@code " />
-				<StringDetect attribute="InlineTag" context="LiteralTagar" String="{@code&#009;" />
-				<StringDetect attribute="InlineTag" context="#stay" String="{@docRoot}" />
-				<StringDetect attribute="InlineTag" context="#stay" String="{@inheritDoc}" />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@link " />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@link&#009;" />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@linkplain " />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@linkplain&#009;" />
-				<StringDetect attribute="InlineTag" context="LiteralTagar" String="{@literal " />
-				<StringDetect attribute="InlineTag" context="LiteralTagar" String="{@literal&#009;" />
-				<StringDetect attribute="InlineTag" context="#stay" String="{@value}" />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@value " />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@value&#009;" />
+				<RegExpr attribute="JavadocFS" context="Javadocar" String="[!?.](\s*$|\s(?![\da-z]))|^\s*\**\s*(?=@(author|deprecated|exception|param|return|see|serial|serialData|serialField|since|throws|version)(\s|$))"/>
+				<IncludeRules context="FindInlineTag"/>
 				<IncludeRules context="##Comments"/>
 				<IncludeRules context="##HTML"/>
 			</context>
+			<context attribute="Javadoc" lineEndContext="#stay" name="FindInlineTag">
+				<WordDetect attribute="InlineTag" context="LiteralTagar" String="{@code"/>
+				<StringDetect attribute="InlineTag" context="#stay" String="{@docRoot}"/>
+				<StringDetect attribute="InlineTag" context="#stay" String="{@inheritDoc}"/>
+				<WordDetect attribute="InlineTag" context="InlineTagar" String="{@link"/>
+				<WordDetect attribute="InlineTag" context="InlineTagar" String="{@linkplain"/>
+				<WordDetect attribute="InlineTag" context="LiteralTagar" String="{@literal"/>
+				<StringDetect attribute="InlineTag" context="#stay" String="{@value}"/>
+				<WordDetect attribute="InlineTag" context="InlineTagar" String="{@value"/>
+				<WordDetect attribute="InlineTag" context="LiteralTagar" String="{@summary"/>
+				<WordDetect attribute="InlineTag" context="LiteralTagar" String="{@systemProperty"/>
+			</context>
 			<context attribute="Javadoc" lineEndContext="#stay" name="Javadocar">
 				<Detect2Chars attribute="JavadocFS" context="#pop#pop" char="*" char1="/" endRegion="Javadoc"/>
-				<RegExpr attribute="JavadocFS" context="#stay" String="\*+(?!/)" firstNonSpace="true"/>
-				<StringDetect attribute="BlockTag" context="#stay" String="@author " />
-				<StringDetect attribute="BlockTag" context="#stay" String="@deprecated " />
-				<StringDetect attribute="BlockTag" context="JavadocParam" String="@exception " />
-				<StringDetect attribute="BlockTag" context="JavadocParam" String="@param " />
-				<StringDetect attribute="BlockTag" context="#stay" String="@return " />
-				<StringDetect attribute="BlockTag" context="SeeTag" String="@see "/>
-				<StringDetect attribute="BlockTag" context="#stay" String="@serial " />
-				<StringDetect attribute="BlockTag" context="#stay" String="@serialData " />
-				<StringDetect attribute="BlockTag" context="#stay" String="@serialField " />
-				<StringDetect attribute="BlockTag" context="#stay" String="@since " />
-				<StringDetect attribute="BlockTag" context="JavadocParam" String="@throws " />
-				<StringDetect attribute="BlockTag" context="#stay" String="@version " />
-				<StringDetect attribute="BlockTag" context="#stay" String="@author&#009;" />
-				<StringDetect attribute="BlockTag" context="#stay" String="@deprecated&#009;" />
-				<StringDetect attribute="BlockTag" context="JavadocParam" String="@exception&#009;" />
-				<StringDetect attribute="BlockTag" context="JavadocParam" String="@param&#009;" />
-				<StringDetect attribute="BlockTag" context="#stay" String="@return&#009;" />
-				<StringDetect attribute="BlockTag" context="SeeTag" String="@see&#009;" />
-				<StringDetect attribute="BlockTag" context="#stay" String="@serial&#009;" />
-				<StringDetect attribute="BlockTag" context="#stay" String="@serialData&#009;" />
-				<StringDetect attribute="BlockTag" context="#stay" String="@serialField&#009;" />
-				<StringDetect attribute="BlockTag" context="#stay" String="@since&#009;" />
-				<StringDetect attribute="BlockTag" context="JavadocParam" String="@throws&#009;" />
-				<StringDetect attribute="BlockTag" context="#stay" String="@version&#009;" />
-				<StringDetect attribute="InlineTag" context="LiteralTagar" String="{@code " />
-				<StringDetect attribute="InlineTag" context="LiteralTagar" String="{@code&#009;" />
-				<StringDetect attribute="InlineTag" context="#stay" String="{@docRoot}" />
-				<StringDetect attribute="InlineTag" context="#stay" String="{@inheritDoc}" />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@link " />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@link&#009;" />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@linkplain " />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@linkplain&#009;" />
-				<StringDetect attribute="InlineTag" context="LiteralTagar" String="{@literal " />
-				<StringDetect attribute="InlineTag" context="LiteralTagar" String="{@literal&#009;" />
-				<StringDetect attribute="InlineTag" context="#stay" String="{@value}" />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@value " />
-				<StringDetect attribute="InlineTag" context="InlineTagar" String="{@value&#009;" />
-				<IncludeRules context="##Comments"/>
+				<DetectChar attribute="JavadocFS" context="JavadocFSStarPrefix" char="*" firstNonSpace="true"/>
+				<WordDetect attribute="BlockTag" context="#stay" String="@author"/>
+				<WordDetect attribute="BlockTag" context="#stay" String="@deprecated"/>
+				<WordDetect attribute="BlockTag" context="JavadocParam" String="@exception"/>
+				<WordDetect attribute="BlockTag" context="JavadocParam" String="@param"/>
+				<WordDetect attribute="BlockTag" context="#stay" String="@return"/>
+				<WordDetect attribute="BlockTag" context="SeeTag" String="@see"/>
+				<WordDetect attribute="BlockTag" context="#stay" String="@serial"/>
+				<WordDetect attribute="BlockTag" context="#stay" String="@serialData"/>
+				<WordDetect attribute="BlockTag" context="#stay" String="@serialField"/>
+				<WordDetect attribute="BlockTag" context="#stay" String="@since"/>
+				<WordDetect attribute="BlockTag" context="JavadocParam" String="@throws"/>
+				<WordDetect attribute="BlockTag" context="#stay" String="@version"/>
+				<IncludeRules context="FindInlineTag"/>
+				<IncludeRules context="##Alerts"/>
 				<IncludeRules context="##HTML"/>
 			</context>
-			<context attribute="Javadoc" lineEndContext="#pop" name="JavadocParam">
-				<DetectSpaces />
-				<RegExpr attribute="JavadocParam" context="#pop#pop" String="\S*(?=\*/)" />
-				<RegExpr attribute="JavadocParam" context="#pop" String="\S*(\s|$)" />
-				<IncludeRules context="##Comments"/>
+			<context attribute="Javadoc" lineEndContext="#pop" name="JavadocFSStarPrefix" fallthroughContext="#pop">
+				<Detect2Chars attribute="JavadocFS" context="#pop#pop#pop" char="*" char1="/" endRegion="Javadoc"/>
+				<DetectChar attribute="JavadocFS" context="#stay" char="*"/>
+			</context>
+			<context attribute="Javadoc" lineEndContext="#pop" name="JavadocParam" fallthroughContext="JavadocParamIdent">
+				<DetectSpaces context="JavadocParamIdent"/>
+			</context>
+			<context attribute="JavadocParam" lineEndContext="#pop#pop" name="JavadocParamIdent">
+				<DetectSpaces attribute="Javadoc" context="#pop#pop"/>
+				<Detect2Chars attribute="JavadocFS" context="#pop#pop#pop#pop" char="*" char1="/" endRegion="Javadoc"/>
 			</context>
 			<context attribute="InlineTag" name="InlineTagar" lineEndContext="#stay">
 				<DetectChar attribute="InlineTag" context="#pop" char="}" />
diff --git a/xml/javascript-react.xml b/xml/javascript-react.xml
--- a/xml/javascript-react.xml
+++ b/xml/javascript-react.xml
@@ -53,7 +53,7 @@
      * v1 [2018-06-20]: Initial version
 -->
 
-<language name="JavaScript React (JSX)" version="9" kateversion="5.0" section="Scripts" indenter="cstyle"
+<language name="JavaScript React (JSX)" version="9" kateversion="5.53" section="Scripts" indenter="cstyle"
           priority="9" extensions="*.jsx" mimetype="text/jsx;text/x-jsx;application/jsx;application/x-jsx;"
           author="Nibaldo González (nibgonz@gmail.com)" license="MIT">
 
diff --git a/xml/javascript.xml b/xml/javascript.xml
--- a/xml/javascript.xml
+++ b/xml/javascript.xml
@@ -17,7 +17,7 @@
    * QML
    * CoffeeScript (embedded)
 -->
-<language name="JavaScript" version="17" kateversion="5.0" section="Scripts" extensions="*.js;*.kwinscript;*.julius"
+<language name="JavaScript" version="17" kateversion="5.53" section="Scripts" extensions="*.js;*.kwinscript;*.julius"
           mimetype="text/x-javascript;application/x-javascript;application/javascript;text/javascript" indenter="cstyle"
           author="Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net)" license="">
 
diff --git a/xml/jsp.xml b/xml/jsp.xml
--- a/xml/jsp.xml
+++ b/xml/jsp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language version="8" kateversion="5.0" name="JSP" section="Markup" extensions="*.jsp;*.JSP" mimetype="text/html" casesensitive="false" author="Rob Martin (rob@gamepimp.com)" license="LGPL">
+<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>
 
     <list name="jsp-reserved-words">
diff --git a/xml/kotlin.xml b/xml/kotlin.xml
--- a/xml/kotlin.xml
+++ b/xml/kotlin.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+    <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)">
+    <!ENTITY hex "(?:[0-9a-fA-F]++(_++[0-9a-fA-F]++)*+)">
+    <!ENTITY exp "(?:[eE][-+]?&int;)">
+    <!ENTITY float "(\b&int;(\.((&int;&exp;?+|&exp;)[fF]?\b|[fF]\b)?|&exp;[fF]?\b|[fF]\b)|\.&int;&exp;?[fF]?\b)">
+    <!ENTITY hexfloat "\b0[xX](&hex;\.?+&hex;?+|\.&hex;?)[pP][-+]?&int;[fF]?\b">
+]>
 <!-- kotlin language syntax http://kotlinlang.org -->
-<language name="Kotlin" version="8" kateversion="5.0" section="Sources" extensions="*.kt;*.kts" license="LGPLv2+" author="Sergey Mashkov (sergey.mashkov@jetbrains.com)" style="cstyle" indenter="cstyle">
+<language name="Kotlin" version="9" kateversion="5.62" section="Sources" extensions="*.kt;*.kts" license="LGPLv2+" author="Sergey Mashkov (sergey.mashkov@jetbrains.com)" style="cstyle" indenter="cstyle">
     <highlighting>
         <list name="keywords">
             <item>package</item>
@@ -96,47 +103,124 @@
         </list>
 
         <contexts>
+            <context attribute="Normal Text" lineEndContext="#stay" name="Start" fallthroughContext="Normal">
+                <Detect2Chars attribute="Comment" context="Shebang" char="#" char1="!" />
+            </context>
+            <context attribute="Normal Text" lineEndContext="#pop!Normal" name="Shebang">
+            </context>
+
             <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-                <RegExpr attribute="Keyword" context="Imports" String="\b(package|import)\b"/>
-                <RegExpr attribute="Keyword" context="FunctionDeclaration" String="\bfun\b"/>
-                <RegExpr attribute="Keyword" context="TypeDeclaration" String="\b(object|class|interface)\b"/>
-                <RegExpr attribute="Keyword" context="VariableDeclaration" String="\b(val|var)\b"/>
+                <DetectSpaces context="#stay"/>
 
+                <DetectChar attribute="Symbol" context="Dot" char="." lookAhead="1"/>
+                <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1"/>
+                <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"/>
+                <DetectChar attribute="Annotation" context="Annotation" char="@" />
+
+                <Detect2Chars attribute="Comment" context="CommentSingleLine" char="/" char1="/"/>
+                <Detect2Chars attribute="Comment" context="CommentMultiline" char="/" char1="*" beginRegion="Comment"/>
+
+                <AnyChar attribute="Symbol" context="#stay" String="()[]&amp;|+,-/*&lt;=&gt;;!%?:~^"/>
+
+                <AnyChar context="Number" String="0123456789" lookAhead="1"/>
+
+                <DetectChar context="String" char="&quot;" lookAhead="1"/>
+                <DetectChar context="Char" char="'" lookAhead="1"/>
+
+                <WordDetect attribute="Keyword" context="VariableDeclaration" String="val"/>
+                <WordDetect attribute="Keyword" context="VariableDeclaration" String="var"/>
+
+                <WordDetect attribute="Keyword" context="FunctionDeclaration" String="fun"/>
+
+                <WordDetect attribute="Keyword" context="Imports" String="package"/>
+                <WordDetect attribute="Keyword" context="Imports" String="import"/>
+
+                <WordDetect attribute="Keyword" context="TypeDeclaration" String="object"/>
+                <WordDetect attribute="Keyword" context="TypeDeclaration" String="class"/>
+                <WordDetect attribute="Keyword" context="TypeDeclaration" String="interface"/>
+
                 <keyword attribute="Keyword" context="#stay" String="predeclared"/>
                 <keyword attribute="Keyword" context="#stay" String="keywords"/>
                 <keyword attribute="ControlFlowKeyword" context="#stay" String="controlFlowKeyword"/>
                 <keyword attribute="Keyword" context="#stay" String="types"/>
 
-                <StringDetect attribute="String" String="&quot;&quot;&quot;" context="MultiLineDoubleString" beginRegion="MultiLineString"/>
-                <DetectChar attribute="String" context="String" char="&quot;"/>
-                <DetectChar attribute="Char" context="Char" char="'"/>
+                <DetectIdentifier attribute="Normal Text"/>
+            </context>
 
-                <Detect2Chars attribute="Comment" context="CommentSingleLine" char="/" char1="/"/>
-                <Detect2Chars attribute="Comment" context="CommentMultiline" char="/" char1="*" beginRegion="Comment"/>
+            <context attribute="Normal Text" lineEndContext="#stay" name="Number">
+                <IncludeRules context="FindFloat"/>
+                <RegExpr attribute="Hex" context="#pop" String="\b0[xX]&hex;[lL]?\b"/>
+                <RegExpr attribute="Binary" context="#pop" String="\b0[bB][01]++(_++[01]++)*+[uUlL]?\b"/>
+                <RegExpr attribute="Decimal" context="#pop" String="\b(0|[1-9][0-9]*+(_++[0-9_]++)*+)[uUlL]?\b"/>
+                <AnyChar attribute="Error" context="#pop" String="0123456789"/>
+            </context>
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindFloat">
+                <RegExpr attribute="Float" context="#pop" String="&float;|&hexfloat;"/>
+            </context>
 
-                <Float attribute="Float" context="Float Suffixes"/>
-                <Int attribute="Decimal" context="Int Suffixes"/>
+            <context attribute="Normal Text" lineEndContext="#stay" name="Dot">
+                <IncludeRules context="FindFloat"/>
+                <DetectChar attribute="Symbol" context="#pop" char="." />
+            </context>
 
-                <RegExpr attribute="Annotation" context="#stay" String="@[_\w][_\w\d]*"/>
-                <RegExpr attribute="TODO" context="#stay" String="TODO\s*\([^)]*\)" />
-                <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
-                <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
-                <Detect2Chars attribute="Comment" context="CommentSingleLine" char="#" char1="!" />
+            <context attribute="Normal Text" lineEndContext="#pop" name="Annotation" fallthroughContext="#pop">
+                <DetectIdentifier attribute="Annotation" context="#pop"/>
             </context>
 
-            <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-                <AnyChar String="fF" attribute="Float" context="#pop"/>
+            <context attribute="Normal Text" lineEndContext="#stay" name="Char">
+                <HlCChar attribute="Char" context="#pop"/>
+                <RegExpr attribute="Char" context="#pop" String="'\\u[0-9a-fA-F]{4}'"/>
+                <RegExpr attribute="Error" context="#pop" String="'(\\(u[0-9a-fA-F]*|.))?'?"/>
             </context>
 
-            <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-                <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+            <context attribute="String" lineEndContext="#pop" name="String">
+                <StringDetect attribute="String" context="#pop!MultiLineString" String="&quot;&quot;&quot;" beginRegion="MultiLineString"/>
+                <DetectChar attribute="String" context="#pop!SingleLineString" char="&quot;"/>
             </context>
+            <context attribute="String" lineEndContext="#pop" name="SingleLineString">
+                <DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+                <DetectChar context="Interpolation" char="$" lookAhead="1"/>
+                <DetectChar attribute="String" context="#pop" char="&quot;"/>
+            </context>
+            <context attribute="String" lineEndContext="#stay" name="MultiLineString">
+                <DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+                <DetectChar context="Interpolation" char="$" lookAhead="1"/>
+                <DetectChar context="MultiLineStringFinal" char="&quot;" lookAhead="1"/>
+            </context>
+            <context attribute="String" lineEndContext="#stay" name="MultiLineStringFinal">
+                <StringDetect context="MultiLineStringNoFinal" String="&quot;&quot;&quot;&quot;" lookAhead="1"/>
+                <StringDetect attribute="String" context="#pop#pop" String="&quot;&quot;&quot;" endRegion="MultiLineString"/>
+                <Detect2Chars attribute="String" context="#pop" char="&quot;" char1="&quot;"/>
+                <DetectChar attribute="String" context="#pop" char="&quot;"/>
+            </context>
+            <context attribute="String" lineEndContext="#stay" name="MultiLineStringNoFinal">
+                <DetectChar attribute="String" context="#pop" char="&quot;"/>
+            </context>
+            <context attribute="String" lineEndContext="#pop" name="StringEscapedChar">
+                <HlCStringChar attribute="String Char" context="#pop"/>
+                <Detect2Chars attribute="String Char" context="#pop" char="\" char1="$"/>
+                <RegExpr attribute="String Char" context="#pop" String="\\u[0-9a-fA-F]{4}"/>
+                <RegExpr attribute="Error" context="#pop" String="\\(u[0-9a-fA-F]*|.)?"/>
+            </context>
 
-            <context attribute="Normal Text" lineEndContext="#pop" name="Imports">
-                <DetectChar attribute="Symbol" context="#pop" char=";" />
-                <Detect2Chars attribute="Keyword" context="TypeName" char="a" char1="s" />
+            <context attribute="String" lineEndContext="#stay" name="Interpolation">
+                <Detect2Chars attribute="String Interpolation" context="#pop!InInterpolation" char="$" char1="{"/>
+                <DetectChar attribute="String Interpolation" context="#pop!Variable" char="$"/>
+            </context>
+            <context attribute="String Interpolation" lineEndContext="#stay" name="InInterpolation">
+                <DetectChar attribute="String Interpolation" context="#pop" char="}"/>
+                <IncludeRules context="Normal"/>
+            </context>
+            <context attribute="String" lineEndContext="#pop" name="Variable" fallthroughContext="#pop">
+                <DetectIdentifier attribute="String Interpolation" context="#pop"/>
+            </context>
 
-                <RegExpr attribute="Imports" context="#stay" String="\b[_\w][_\w\d]*(\.[_\w][_\w\d]*)*(\.\*)?"/>
+            <context attribute="Normal Text" lineEndContext="#pop" name="Imports">
+                <DetectChar attribute="Symbol" context="#stay" char="."/>
+                <AnyChar attribute="Symbol" context="#stay" String=".*"/>
+                <WordDetect attribute="Keyword" context="TypeName" String="as" />
+                <DetectIdentifier attribute="Imports" context="#stay"/>
+                <DetectChar attribute="Symbol" context="#pop" char=";"/>
             </context>
 
             <context name="VariableDeclaration" lineEndContext="#stay" attribute="Normal Text">
@@ -160,7 +244,7 @@
                 <DetectChar attribute="Symbol" context="Parameters" char="(" />
                 <DetectChar attribute="Symbol" context="TypeParameters" char="&lt;" />
 
-                <RegExpr attribute="Data Type" context="#stay" String="[_\w][_\w\d]*" />
+                <DetectIdentifier attribute="Data Type" context="#stay"/>
             </context>
 
             <context name="FunctionDeclaration" lineEndContext="#stay" attribute="Normal Text">
@@ -172,7 +256,7 @@
 
                 <AnyChar attribute="Symbol" context="#pop" String="{=" lookAhead="true" />
 
-                <RegExpr attribute="Function" context="#stay" String="[_\w][_\w\d]*" />
+                <DetectIdentifier attribute="Function" context="#stay"/>
             </context>
 
             <context name="TypeParameters" lineEndContext="#stay" attribute="Normal Text">
@@ -184,79 +268,66 @@
                 <DetectChar attribute="Symbol" context="#pop" char="&gt;" />
                 <DetectChar attribute="Symbol" context="TypeParameters" char="&lt;" />
 
-                <RegExpr attribute="Data Type" context="#stay" String="[_\w][_\w\d]*[?]?" />
+                <DetectIdentifier attribute="Data Type" context="DataTypeSuffix"/>
             </context>
+            <context name="DataTypeSuffix" lineEndContext="#pop" attribute="Normal Text" fallthroughContext="#pop">
+                <DetectChar attribute="Symbol" context="#pop" char="?"/>
+            </context>
 
             <context name="Parameters" lineEndContext="#stay" attribute="Normal Text">
                 <keyword attribute="Keyword" context="#stay" String="keywords" />
                 <DetectChar attribute="Symbol" context="#pop" char=")" />
                 <DetectChar attribute="Symbol" context="TypeName" char=":" />
                 <DetectChar attribute="Symbol" context="Expression" char="=" />
-                <RegExpr attribute="Variable" context="#stay" String="[_\w][_\w\d]*" />
+                <DetectIdentifier attribute="Variable" context="#stay"/>
+                <DetectChar attribute="Symbol" context="#stay" char=","/>
             </context>
 
             <context name="TypeName" lineEndContext="#stay" attribute="Normal Text">
-                <DetectChar attribute="Symbol" context="#pop" char="*" />
+                <AnyChar attribute="Symbol" context="#pop" String=",*" />
                 <DetectChar attribute="Symbol" context="FunctionType" char="(" />
                 <Detect2Chars attribute="Symbol" context="#stay" char="-" char1="&gt;" />
-                <RegExpr attribute="Data Type" context="#pop" String="[_\w][_\w\d]*[?]?" />
+                <DetectIdentifier attribute="Data Type" context="#pop!DataTypeSuffix"/>
             </context>
 
             <context name="FunctionType" lineEndContext="#stay" attribute="Normal Text">
                 <DetectChar attribute="Symbol" context="#pop" char=")" />
-                <RegExpr attribute="Data Type" context="#stay" String="[_\w][_\w\d]*[?]?" />
+                <DetectIdentifier attribute="Data Type" context="DataTypeSuffix"/>
                 <Detect2Chars attribute="Symbol" context="#stay" char="-" char1="&gt;" />
                 <DetectChar attribute="Symbol" context="#stay" char="," />
             </context>
 
             <context name="Expression" lineEndContext="#stay" attribute="Normal Text">
-                <DetectChar attribute="Symbol" context="ExpressionInner" char="(" />
                 <DetectChar attribute="Symbol" context="#pop" char=")" lookAhead="true" />
-
-                <DetectChar attribute="Symbol" context="ExpressionInner" char="{" />
-                <DetectChar attribute="Symbol" context="#pop" char="}" lookAhead="true" />
-
-                <RegExpr attribute="Symbol" context="TypeParameters" String="&lt;\w+" lookAhead="true" />
-
-                <DetectChar attribute="Char" context="Char" char="'"/>
-                <StringDetect attribute="String" String="&quot;&quot;&quot;" context="MultiLineDoubleString" beginRegion="MultiLineString"/>
-                <DetectChar attribute="String" context="String" char="&quot;"/>
-
-                <Detect2Chars attribute="Comment" context="CommentSingleLine" char="/" char1="/"/>
-                <Detect2Chars attribute="Comment" context="CommentMultiline" char="/" char1="*" beginRegion="Comment"/>
-
+                <DetectChar attribute="Error" context="#pop" char="}" />
                 <DetectChar attribute="Symbol" context="#pop" char=","/>
+                <IncludeRules context="FindSubExpression"/>
             </context>
-
-            <context name="ExpressionInner" lineEndContext="#stay" attribute="Normal Text">
-                <DetectChar attribute="Symbol" context="ExpressionInner" char="(" />
-                <DetectChar attribute="Symbol" context="#pop" char=")" />
+            <context name="FindSubExpression" lineEndContext="#stay" attribute="Normal Text">
+                <DetectSpaces attribute="Normal Text"/>
 
-                <DetectChar attribute="Symbol" context="ExpressionInner" char="{" />
-                <DetectChar attribute="Symbol" context="#pop" char="}" />
+                <AnyChar attribute="Symbol" context="ExpressionInner" String="({" />
 
-                <RegExpr attribute="Symbol" context="TypeParameters" String="&lt;\w+" lookAhead="true" />
+                <DetectChar context="MaybeTypeParameters" char="&lt;" lookAhead="1" />
 
-                <DetectChar attribute="Char" context="Char" char="'"/>
-                <StringDetect attribute="String" String="&quot;&quot;&quot;" context="MultiLineDoubleString" beginRegion="MultiLineString"/>
-                <DetectChar attribute="String" context="String" char="&quot;"/>
+                <DetectChar attribute="Symbol" context="Dot" char="." lookAhead="1"/>
+                <AnyChar context="Number" String="0123456789" lookAhead="1"/>
+                <DetectChar context="String" char="&quot;" lookAhead="1"/>
+                <DetectChar context="Char" char="'" lookAhead="1"/>
 
                 <Detect2Chars attribute="Comment" context="CommentSingleLine" char="/" char1="/"/>
                 <Detect2Chars attribute="Comment" context="CommentMultiline" char="/" char1="*" beginRegion="Comment"/>
-            </context>
 
-            <context attribute="Char" lineEndContext="#pop" name="Char">
-                <RegExpr attribute="String Char" context="#stay" String="\\u[0-9a-fA-F]{4}"/>
-                <DetectChar attribute="Char" context="#pop" char="'"/>
+                <DetectIdentifier attribute="Normal Text"/>
             </context>
-            <context attribute="String" lineEndContext="#pop" name="String">
-                <LineContinue attribute="String" context="#stay"/>
-                <HlCStringChar attribute="String Char" context="#stay"/>
-                <RegExpr attribute="String Char" context="#stay" String="\\u[0-9a-fA-F]{4}"/>
-                <DetectChar attribute="String" context="#pop" char="&quot;"/>
+            <context name="MaybeTypeParameters" lineEndContext="#pop" attribute="Normal Text">
+                <RegExpr context="#pop!TypeParameters" String="&lt;\w" lookAhead="1" />
+                <DetectChar attribute="Symbol" context="#pop" char="&lt;"/>
             </context>
-            <context attribute="String" lineEndContext="#stay" name="MultiLineDoubleString">
-                <StringDetect attribute="String" context="#pop" String="&quot;&quot;&quot;" endRegion="MultiLineString"/>
+
+            <context name="ExpressionInner" lineEndContext="#stay" attribute="Normal Text">
+                <AnyChar attribute="Symbol" context="#pop" String=")}" />
+                <IncludeRules context="FindSubExpression"/>
             </context>
 
             <context attribute="Comment" lineEndContext="#pop" name="CommentSingleLine">
@@ -265,6 +336,7 @@
             </context>
             <context attribute="Comment" lineEndContext="#stay" name="CommentMultiline">
                 <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+                <Detect2Chars attribute="Comment" context="CommentMultiline" char="/" char1="*" beginRegion="Comment"/>
                 <DetectSpaces />
                 <IncludeRules context="##Comments"/>
             </context>
@@ -272,22 +344,25 @@
         </contexts>
 
         <itemDatas>
-            <itemData name="Normal Text"  defStyleNum="dsNormal"/>
-            <itemData name="Keyword"      defStyleNum="dsKeyword"/>
-            <itemData name="ControlFlowKeyword" defStyleNum="dsControlFlow" />
-            <itemData name="Function"     defStyleNum="dsFunction"/>
-            <itemData name="Variable"     defStyleNum="dsVariable"/>
-            <itemData name="Imports"      defStyleNum="dsImport"/>
-            <itemData name="Annotation"   defStyleNum="dsAttribute"/>
-            <itemData name="Data Type"    defStyleNum="dsDataType" bold="true" />
-            <itemData name="Decimal"      defStyleNum="dsDecVal"/>
-            <itemData name="Float"        defStyleNum="dsFloat"/>
-            <itemData name="Char"         defStyleNum="dsChar"/>
+            <itemData name="Normal Text"  defStyleNum="dsNormal" spellChecking="false"/>
+            <itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false"/>
+            <itemData name="ControlFlowKeyword" defStyleNum="dsControlFlow" spellChecking="false"/>
+            <itemData name="Function"     defStyleNum="dsFunction" spellChecking="false"/>
+            <itemData name="Variable"     defStyleNum="dsVariable" spellChecking="false"/>
+            <itemData name="Imports"      defStyleNum="dsImport" spellChecking="false"/>
+            <itemData name="Annotation"   defStyleNum="dsAttribute" spellChecking="false"/>
+            <itemData name="Data Type"    defStyleNum="dsDataType" spellChecking="false"/>
+            <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
+            <itemData name="Hex"          defStyleNum="dsBaseN" spellChecking="false"/>
+            <itemData name="Binary"       defStyleNum="dsBaseN" spellChecking="false"/>
+            <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
+            <itemData name="Char"         defStyleNum="dsChar" spellChecking="false"/>
             <itemData name="String"       defStyleNum="dsString"/>
-            <itemData name="String Char"  defStyleNum="dsSpecialChar"/>
+            <itemData name="String Char"  defStyleNum="dsSpecialChar" spellChecking="false"/>
+            <itemData name="String Interpolation" defStyleNum="dsSpecialString"/>
             <itemData name="Comment"      defStyleNum="dsComment"/>
-            <itemData name="Symbol"       defStyleNum="dsNormal"/>
-            <itemData name="TODO"         defStyleNum="dsAlert" />
+            <itemData name="Symbol"       defStyleNum="dsOperator" spellChecking="false"/>
+            <itemData name="Error"        defStyleNum="dsError" spellChecking="false"/>
     </itemDatas>
     </highlighting>
     <general>
diff --git a/xml/lex.xml b/xml/lex.xml
--- a/xml/lex.xml
+++ b/xml/lex.xml
@@ -20,7 +20,7 @@
   
   ========================================================================
 -->
-<language name="Lex/Flex" version="5" kateversion="2.4" section="Sources" extensions="*.l;*.lex;*.flex" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
+<language name="Lex/Flex" version="5" kateversion="5.0" section="Sources" extensions="*.l;*.lex;*.flex" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
 
 <highlighting>
 <contexts>
@@ -100,7 +100,7 @@
   </context>
   
   <context name="Detect C" attribute="Normal Text" lineEndContext="#stay">
-    <RegExpr attribute="Normal Text" context="Indented C" String="^\s" />
+    <DetectSpaces attribute="Normal Text" context="Indented C" column="0" />
     <Detect2Chars attribute="Content-Type Delimiter" context="Lex C Bloc" char="%" char1="{" beginRegion="lexCbloc" column="0"/>
   </context>
   <context name="Indented C" attribute="Normal Text" lineEndContext="#pop">
diff --git a/xml/lilypond.xml b/xml/lilypond.xml
--- a/xml/lilypond.xml
+++ b/xml/lilypond.xml
@@ -56,7 +56,7 @@
 ]>
 <language name="LilyPond" section="Other"
           style="lilypond" indenter="lilypond"
-          version="8" kateversion="3.3"
+          version="8" kateversion="5.0"
           extensions="*.ly;*.LY;*.ily;*.ILY;*.lyi;*.LYI"
           mimetype="text/x-lilypond"
           author="Wilbert Berendsen (info@wilbertberendsen.nl)" license="LGPL">
diff --git a/xml/literate-curry.xml b/xml/literate-curry.xml
--- a/xml/literate-curry.xml
+++ b/xml/literate-curry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Literate Curry" version="5" kateversion="3.4"
+<language name="Literate Curry" version="5" kateversion="5.0"
           section="Sources" extensions="*.lcurry" mimetype="text/x-curry"
           author="Björn Peemöller (bjp@informatik.uni-kiel.de)" license="LGPL"
           indenter="haskell">
diff --git a/xml/literate-haskell.xml b/xml/literate-haskell.xml
--- a/xml/literate-haskell.xml
+++ b/xml/literate-haskell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Literate Haskell" version="8" kateversion="3.4" section="Sources" extensions="*.lhs" mimetype="text/x-literate-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL">
+<language name="Literate Haskell" version="8" kateversion="5.53" section="Sources" extensions="*.lhs" mimetype="text/x-literate-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL">
   <highlighting>
   <contexts>
     <context attribute="Text" lineEndContext="#stay" name="text">
diff --git a/xml/m4.xml b/xml/m4.xml
--- a/xml/m4.xml
+++ b/xml/m4.xml
@@ -38,7 +38,7 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 -->
-<language name="GNU M4" version="5" section="Sources" kateversion="3.0" extensions="*.m4;" author="Jaak Ristioja" license="New BSD License">
+<language name="GNU M4" version="5" section="Sources" kateversion="5.0" extensions="*.m4;" author="Jaak Ristioja" license="New BSD License">
   <highlighting>
     <list name="optbuiltins">
       <item>__gnu__</item>
diff --git a/xml/makefile.xml b/xml/makefile.xml
--- a/xml/makefile.xml
+++ b/xml/makefile.xml
@@ -12,7 +12,7 @@
 <!-- v10 by Peter J. Mello <admin@petermello.net>
      Add recognition of POSIX 2013 '::=' operator for variable assignment -->
 <language name="Makefile" section="Other"
-          version="11" kateversion="3.4"
+          version="11" kateversion="5.0"
           extensions="GNUmakefile;Makefile;makefile;GNUmakefile.*;Makefile.*;makefile.*;*.mk"
           mimetype="text/x-makefile" priority="11"
           author="Per Wigren (wigren@home.se)" license="">
diff --git a/xml/mandoc.xml b/xml/mandoc.xml
--- a/xml/mandoc.xml
+++ b/xml/mandoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Troff Mandoc" section="Markup" version="2" kateversion="2.4" extensions="*.1;*.2;*.3;*.4;*.5;*.6;*.7;*.8;*.1m;*.3x;*.tmac" mimetype="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
+<language name="Troff Mandoc" section="Markup" version="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/xml/markdown.xml b/xml/markdown.xml
--- a/xml/markdown.xml
+++ b/xml/markdown.xml
@@ -94,7 +94,7 @@
   <highlighting>
     <contexts>
       <!-- Start of the Markdown document: find metadata or code block -->
-      <context name="Start Document" attribute="Normal Text" lineEndContext="Normal Text" lineEmptyContext="Normal Text" fallthrough="true" fallthroughContext="Normal Text">
+      <context name="Start Document" attribute="Normal Text" lineEndContext="Normal Text" lineEmptyContext="Normal Text" fallthroughContext="Normal Text">
         <!-- Some titles: (Title|Author|Date|Copyright|Revision|CSS|LaTeX\ XSLT|Categories|Tags|BaseName|Excerpt) -->
         <!-- Metadata: Markdown format -->
         <RegExpr attribute="Metadata" context="metadata" String="\-{3}&end;" column="0" beginRegion="metadata"/>
@@ -109,12 +109,12 @@
         <RegExpr attribute="Metadata Title" String="^&metadatakey;(?=\s|$)" column="0"/>
       </context>
       <context name="metadata-mm-value" attribute="Metadata" lineEndContext="#pop!metadata-mm"/>
-      <context name="metadata-mm" attribute="Metadata" lineEndContext="#stay" lineEmptyContext="#pop!Normal Text" fallthrough="true" fallthroughContext="#pop!Normal Text">
+      <context name="metadata-mm" attribute="Metadata" lineEndContext="#stay" lineEmptyContext="#pop!Normal Text" fallthroughContext="#pop!Normal Text">
         <!-- Find Metadata key or value -->
         <RegExpr attribute="Metadata Title" context="#pop!metadata-mm-value" String="^&metadatakey;(?=\s|$)" column="0"/>
         <RegExpr attribute="Metadata" context="#pop!metadata-mm-value" String="^(?:\s{4}|\t)" column="0"/>
       </context>
-      <context name="find-code-block-start" attribute="Normal Text" lineEndContext="#stay" lineEmptyContext="#stay" fallthrough="true" fallthroughContext="#pop!Normal Text">
+      <context name="find-code-block-start" attribute="Normal Text" lineEndContext="#stay" lineEmptyContext="#stay" fallthroughContext="#pop!Normal Text">
         <IncludeRules context="find-code-block"/>
       </context>
 
@@ -142,7 +142,7 @@
         <RegExpr attribute="Normal Text: Link" String="&implicitlink;"/>
       </context>
       <!-- Find indented code blocks. These are only allowed after an empty line or on the first line -->
-      <context name="find-code-block" attribute="Normal Text" lineEndContext="#stay" lineEmptyContext="#stay" fallthrough="true" fallthroughContext="#pop">
+      <context name="find-code-block" attribute="Normal Text" lineEndContext="#stay" lineEmptyContext="#stay" fallthroughContext="#pop">
         <RegExpr attribute="Code" String="^&indentedcodeblock;" column="0"/>
         <RegExpr attribute="Normal Text" String="&end;" />
         <RegExpr attribute="Comment" context="comment" String="\s*&startcomment;" column="0" beginRegion="comment"/>
@@ -150,12 +150,12 @@
       </context>
 
       <context name="find-header" attribute="Normal Text" lineEndContext="#pop">
-        <RegExpr attribute="Header H1" context="#pop" String="^#\s.*[#]?$"/>
-        <RegExpr attribute="Header H2" context="#pop" String="^##\s.*[#]?$"/>
-        <RegExpr attribute="Header H3" context="#pop" String="^###\s.*[#]?$"/>
-        <RegExpr attribute="Header H4" context="#pop" String="^####\s.*[#]?$"/>
-        <RegExpr attribute="Header H5" context="#pop" String="^#####\s.*[#]?$"/>
-        <RegExpr attribute="Header H6" context="#pop" String="^######\s.*[#]?$"/>
+        <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"/>
+        <RegExpr attribute="Header H6" context="#pop" String="^######\s.*[#]?$" column="0"/>
         <DetectChar attribute="Normal Text" context="#pop" char="#"/>
       </context>
       <context name="find-strong-normal" attribute="Normal Text" lineEndContext="#pop">
@@ -223,7 +223,7 @@
       <!-- NOTE: The indentation of the lists is captured. New paragraphs, code blocks, blockquotes or
            horizontal rules must have an indentation equal to or greater than the list, to be part of it. -->
       <!-- * list -->
-      <context name="list" attribute="List: Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="content-list">
+      <context name="list" attribute="List: Normal Text" lineEndContext="#stay" fallthroughContext="content-list">
         <!-- Find indented code blocks, blockquotes and horizontal rules -->
         <RegExpr attribute="Code" String="%1%2\s&indentedcodeblock;" column="0" dynamic="true"/>
         <RegExpr attribute="Blockquote" context="blockquote-list" String="%1%2\s+&gt;" column="0" dynamic="true"/>
@@ -237,7 +237,7 @@
         <RegExpr attribute="List: Checkbox" context="content-list" String="\s*&checkbox;"/>
       </context>
       <!-- 1. numlist (one digit) -->
-      <context name="numlist" attribute="List: Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="content-list">
+      <context name="numlist" attribute="List: Normal Text" lineEndContext="#stay" fallthroughContext="content-list">
         <!-- Find indented code blocks, blockquotes and horizontal rules -->
         <RegExpr attribute="Code" String="%1%2\s{2}&indentedcodeblock;" column="0" dynamic="true"/>
         <RegExpr attribute="Blockquote" context="blockquote-list" String="%1%2\s{2,}&gt;" column="0" dynamic="true"/>
@@ -249,7 +249,7 @@
         <RegExpr context="#pop" String="^\s*\S" column="0" lookAhead="true"/>
       </context>
       <!-- 10. numlist (two or more digits) -->
-      <context name="numlist2" attribute="List: Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="content-list">
+      <context name="numlist2" attribute="List: Normal Text" lineEndContext="#stay" fallthroughContext="content-list">
         <!-- Find indented code blocks, blockquotes and horizontal rules -->
         <RegExpr attribute="Code" String="%1%2\s{3}&indentedcodeblock;" column="0" dynamic="true"/>
         <RegExpr attribute="Blockquote" context="blockquote-list" String="%1%2\s{3,}&gt;" column="0" dynamic="true"/>
@@ -502,13 +502,13 @@
         <RegExpr attribute="EntityRef" String="&amp;(?:#[0-9]+|#[xX][0-9A-Fa-f]+|&htmlname;);"/>
         <RegExpr context="find-html-block" String="&lt;/?&htmlname;(?:[\s&gt;]|/&gt;|$)" lookAhead="true"/>
       </context>
-      <context name="find-html-block" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+      <context name="find-html-block" attribute="Normal Text" lineEndContext="#pop" fallthroughContext="#pop">
         <IncludeRules context="FindSpecialHTMLTags##HTML"/>
         <IncludeRules context="FindHTMLTags##HTML"/>
       </context>
 
       <!-- Links and email: <https://example.com>, <example@kde.org> -->
-      <context name="autolink" attribute="Auto-Link" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+      <context name="autolink" attribute="Auto-Link" lineEndContext="#pop" fallthroughContext="#pop">
         <DetectChar attribute="Auto-Link" char="&lt;"/>
         <DetectChar attribute="Auto-Link" context="#pop" char="&gt;"/>
         <RegExpr attribute="Link" String="&startlink;[^&quot;&gt;\s]+"/>
@@ -546,21 +546,21 @@
         <RegExpr attribute="Reference-Link: Link" String="\b&startlink;(?:\\.|[^&quot;&gt;\s\]\\])+"/>
       </context>
       <!-- [an example][id] "title" -->
-      <context name="reflink-title" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+      <context name="reflink-title" attribute="Normal Text" lineEndContext="#pop" fallthroughContext="#pop">
         <RegExpr attribute="Reference-Link" context="#pop" String="\s+&quot;(?:\\.|[^&quot;\\])*&quot;"/>
       </context>
 
       <!-- Target Ref.: [foo]: http://example.com/  "Optional Title Here" -->
-      <context name="reflinktarget" attribute="Reference-Link Target" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+      <context name="reflinktarget" attribute="Reference-Link Target" lineEndContext="#pop" fallthroughContext="#pop">
         <RegExpr attribute="Reference-Link Target: Link" context="#pop!reflinktarget-title" String="\s*&link;(?=\s|$)"/>
         <RegExpr attribute="Reference-Link Target" context="#pop!reflinktarget-link" String="\s*&lt;(?=&link;&gt;(?:\s|$))"/>
         <RegExpr attribute="Reference-Link Target" context="#pop!reflinktarget-title" String="\s*#[\w\.\:\-]+\b"/>
       </context>
-      <context name="reflinktarget-link" attribute="Reference-Link Target" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+      <context name="reflinktarget-link" attribute="Reference-Link Target" lineEndContext="#pop" fallthroughContext="#pop">
         <DetectChar attribute="Reference-Link Target" context="#pop!reflinktarget-title" char="&gt;"/>
         <RegExpr attribute="Reference-Link Target: Link" String="&link;"/>
       </context>
-      <context name="reflinktarget-title" attribute="Reference-Link Target" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+      <context name="reflinktarget-title" attribute="Reference-Link Target" lineEndContext="#pop" fallthroughContext="#pop">
         <DetectSpaces attribute="Reference-Link Target"/>
         <RegExpr attribute="Reference-Link Target" context="#pop" String="&quot;(?:\\.|[^&quot;\\])*&quot;"/>
         <RegExpr attribute="Reference-Link Target" context="#pop" String="&apos;(?:\\.|[^&apos;\\])*&apos;"/>
diff --git a/xml/mediawiki.xml b/xml/mediawiki.xml
--- a/xml/mediawiki.xml
+++ b/xml/mediawiki.xml
@@ -1,12 +1,13 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE language SYSTEM "language.dtd" [
+  <!ENTITY tab "&#9;">
   <!ENTITY url          "(http:|https:|ftp:|mailto:)[^]| ]*(?=$|[]|\s])">
   <!ENTITY htmlTagName  "(?![0-9])[\w_:][\w.:_-]*">
   <!ENTITY htmlEntity   "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&htmlTagName;);">
   <!ENTITY wikiLinkWithDescription "\[\[[^]|]*\|[^]]*\]\]">
   <!ENTITY wikiLinkWithoutDescription "\[\[[^]|]*\]\]">
 ]>
-<language name="MediaWiki" section="Markup" version="10" kateversion="5.0" extensions="*.mediawiki" mimetype="" license="FDL" >
+<language name="MediaWiki" section="Markup" version="10" kateversion="5.53" extensions="*.mediawiki" mimetype="" license="FDL" >
   <highlighting>
     <contexts>
       <context attribute="Normal" lineEndContext="#stay" name="normal" >
@@ -58,7 +59,7 @@
         <StringDetect String="&lt;pre&gt;" context="Pre" attribute="HtmlTag" />
         <IncludeRules context="FindSyntaxHighlightingHtmlElement" />
         <RegExpr String="[&lt;][^&gt;]+[&gt;]" attribute="HtmlTag" context="#stay" />
-        <RegExpr String="[\s]" context="Unformatted" column="0" />
+        <AnyChar String="&tab; " context="Unformatted" column="0" />
         <StringDetect String="~~~~" attribute="WikiTag" context="#stay" />
         <StringDetect String="~~~" attribute="WikiTag" context="#stay" />
         <RegExpr String="[-]{4,}" attribute="WikiTag" context="#stay" />
@@ -509,8 +510,7 @@
       </context>
 
       <context name="FindHtmlStartTagAttributes" attribute="Normal" lineEndContext="#stay">
-        <RegExpr attribute="HtmlAttribute" context="HtmlAttribute" String="^&htmlTagName;" />
-        <RegExpr attribute="HtmlAttribute" context="HtmlAttribute" String="\s+&htmlTagName;" />
+        <RegExpr attribute="HtmlAttribute" context="HtmlAttribute" String="^&htmlTagName;|\s+&htmlTagName;" />
         <RegExpr attribute="Error" context="#stay" String="\S" />
       </context>
 
diff --git a/xml/mips.xml b/xml/mips.xml
--- a/xml/mips.xml
+++ b/xml/mips.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="MIPS Assembler" version="6" kateversion="2.4" section="Assembler" extensions="*.s;" mimetype="text/x-mips" author="Dominik Haumann (dhaumann@kde.org)" license="MIT" priority="-1">
+<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">
       <item>.align</item>
diff --git a/xml/modula-2.xml b/xml/modula-2.xml
--- a/xml/modula-2.xml
+++ b/xml/modula-2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language name="Modula-2" mimetype="text/x-modula2" version="7"
-  kateversion="2.2" section="Sources" priority="5" extensions="*.mod;*.def"
+  kateversion="5.0" section="Sources" priority="5" extensions="*.mod;*.def"
   casesensitive="1"  author="B. Kowarsch (trijezdci@github)"  license="MIT">
 <!--
   *****************************************************************************
diff --git a/xml/modula-3.xml b/xml/modula-3.xml
--- a/xml/modula-3.xml
+++ b/xml/modula-3.xml
@@ -6,7 +6,7 @@
 <!-- 04.03.2005 ik mailed version 1.01 with fixed/implemented nested comments to Dominik -->
 <!-- known bug: notation Regexp( [0-9]*\. ) should be not interpreted as neither Integer neither Real -->
 <!-- known bug: notation Regexp ( "  \" " ) is not properly interpreted -->
-<language name="Modula-3" version="4" kateversion="2.1" section="Sources" extensions="*.m3;*.i3;*.ig;*.mg;" mimetype="text/x-modula-3" license="LGPL">
+<language name="Modula-3" version="4" kateversion="5.0" section="Sources" extensions="*.m3;*.i3;*.ig;*.mg;" mimetype="text/x-modula-3" license="LGPL">
   <highlighting>
     <list name="keywords">
 <!--      <item>AND</item> -->
diff --git a/xml/monobasic.xml b/xml/monobasic.xml
--- a/xml/monobasic.xml
+++ b/xml/monobasic.xml
@@ -10,7 +10,7 @@
     License: GNU General Public License
 -->
 
-<language name="MonoBasic" section="Sources" version="5" kateversion="2.3" extensions="*.vb" mimetype="" author="Davide Bettio (davide.bettio@kdemail.net)" license="GPL">
+<language name="MonoBasic" section="Sources" version="5" kateversion="5.0" extensions="*.vb" mimetype="" author="Davide Bettio (davide.bettio@kdemail.net)" license="GPL">
   <highlighting>
      <list name="keywords">
         <item>Option</item>
diff --git a/xml/mustache.xml b/xml/mustache.xml
--- a/xml/mustache.xml
+++ b/xml/mustache.xml
@@ -43,7 +43,7 @@
      * v1 [2019-02-10]: Initial version
 -->
 
-<language name="Mustache/Handlebars (HTML)" version="6" kateversion="5.44"
+<language name="Mustache/Handlebars (HTML)" version="6" kateversion="5.53"
           section="Markup" priority="1" mimetype=""
           extensions="*.mustache;*.handlebars;*.hbs;*.ractive;*.hogan;*.hulk;*.html.mst;*.html.mu;*.html.rac"
           author="Nibaldo González (nibgonz@gmail.com), based on the HTML highlighter by Wilbert Berendsen (wilbert@kde.nl)"
diff --git a/xml/nim.xml b/xml/nim.xml
--- a/xml/nim.xml
+++ b/xml/nim.xml
@@ -21,7 +21,7 @@
 <language
 	name="Nim"
 	version="3"
-	kateversion="5.0"
+	kateversion="5.53"
 	section="Sources"
 	extensions="*.nim"
 	mimetype="text/x-nim"
diff --git a/xml/noweb.xml b/xml/noweb.xml
--- a/xml/noweb.xml
+++ b/xml/noweb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="noweb" version="4" kateversion="2.4" section="Sources" extensions="*.w;*.nw" author="Scott Collins (scc@scottcollins.net)">
+<language name="noweb" version="4" kateversion="5.53" section="Sources" extensions="*.w;*.nw" author="Scott Collins (scc@scottcollins.net)">
 <!-- 
 #########################################################################
 # First version added to repository was 0.4, added as 1.0 .
@@ -18,7 +18,7 @@
   <highlighting>
     <contexts>
       <context name="RawDocumentation" attribute="Prose" lineEndContext="#stay">
-        <RegExpr String="^&lt;&lt;.*&gt;&gt;=$" attribute="SectionName" context="CodeSection" beginRegion="CodeSection" />
+        <RegExpr String="^&lt;&lt;.*&gt;&gt;=$" attribute="SectionName" context="CodeSection" beginRegion="CodeSection" column="0" />
         <Detect2Chars char="@" char1="[" context="#stay" />
         <Detect2Chars char="[" char1="[" attribute="Punctuation" context="CodeQuote" />
         <IncludeRules context="##HTML" includeAttrib="true" />
@@ -30,9 +30,9 @@
         <IncludeRules context="##C++" includeAttrib="true" />
       </context>
       <context name="CodeSection" attribute="Code" lineEndContext="#stay">
-        <RegExpr String="^@$" attribute="Punctuation" context="RawDocumentation" endRegion="CodeSection" />
-        <RegExpr String="^@(?=[\s%])" attribute="Punctuation" context="RawDocumentation" endRegion="CodeSection" />
-        <RegExpr String="^&lt;&lt;.*&gt;&gt;=$" context="RawDocumentation" lookAhead="true" endRegion="CodeSection" />
+        <RegExpr String="^@$" attribute="Punctuation" context="RawDocumentation" endRegion="CodeSection" column="0" />
+        <RegExpr String="^@(?=[\s%])" attribute="Punctuation" context="RawDocumentation" endRegion="CodeSection" column="0" />
+        <RegExpr String="^&lt;&lt;.*&gt;&gt;=$" context="RawDocumentation" lookAhead="true" endRegion="CodeSection" column="0" />
         <IncludeRules context="SectionNames" />
         <IncludeRules context="##C++" includeAttrib="true" />
       </context>
diff --git a/xml/objectivec.xml b/xml/objectivec.xml
--- a/xml/objectivec.xml
+++ b/xml/objectivec.xml
@@ -73,13 +73,11 @@
       </context>
       <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
           <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+          <AnyChar attribute="Decimal" context="#pop" String="ULul"/>
       </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
diff --git a/xml/objectivecpp.xml b/xml/objectivecpp.xml
--- a/xml/objectivecpp.xml
+++ b/xml/objectivecpp.xml
@@ -207,13 +207,11 @@
       </context>
       <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
           <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+          <AnyChar attribute="Decimal" context="#pop" String="ULuL"/>
       </context>
       <context attribute="String" lineEndContext="#pop" name="String">
         <LineContinue attribute="String" context="#stay"/>
@@ -238,17 +236,12 @@
 
       <context attribute="Preprocessor" lineEndContext="#pop" name="Preprocessor">
         <LineContinue attribute="Preprocessor" context="#stay"/>
-        <RegExpr attribute="Preprocessor" context="Define" String="define.*((?=\\))"/>
-        <RegExpr attribute="Preprocessor" context="#stay" String="define.*"/>
+        <RegExpr attribute="Preprocessor" context="#stay" String="define(?:[^\\]++|\\.)++"/>
         <RangeDetect attribute="Prep. Lib" context="#stay" char="&quot;" char1="&quot;"/>
         <RangeDetect attribute="Prep. Lib" context="#stay" char="&lt;" char1="&gt;"/>
         <IncludeRules context="FindComments" />
       </context>
 
-      <context attribute="Preprocessor" lineEndContext="#pop" name="Define">
-        <LineContinue attribute="Preprocessor" context="#stay"/>
-      </context>
-
       <context attribute="Comment" lineEndContext="#stay" name="Outscoped" >
         <DetectSpaces />
         <IncludeRules context="##Comments" />
@@ -256,7 +249,7 @@
         <DetectChar attribute="String" context="String" char="&quot;"/>
         <IncludeRules context="FindComments" />
         <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="Outscoped" firstNonSpace="true" />
-        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*(endif|else|elif)" endRegion="Outscoped" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*(?:endif|else|elif)" endRegion="Outscoped" firstNonSpace="true" />
       </context>
 
       <context attribute="Comment" lineEndContext="#stay" name="Outscoped intern">
diff --git a/xml/ocaml.xml b/xml/ocaml.xml
--- a/xml/ocaml.xml
+++ b/xml/ocaml.xml
@@ -19,7 +19,7 @@
           section="Sources"
           version="8"
           priority="10"
-          kateversion="2.4"
+          kateversion="5.0"
           author="Glyn Webster (glynwebster@orcon.net.nz) and Vincent Hugot (vincent.hugot@gmail.com)"
           license="LGPL" >
 
@@ -489,7 +489,7 @@
 
 
         <!-- A dash at the start of a line is a bullet point. -->
-        <RegExpr String="^[ &#009;]*-\s" context="#stay"  attribute="Ocamldoc Markup" />
+        <RegExpr String="^[ &#009;]*-\s" context="#stay"  attribute="Ocamldoc Markup" column="0" />
 
         <IncludeRules context="Unmatched Closing Brackets" />
       </context>
diff --git a/xml/opencl.xml b/xml/opencl.xml
--- a/xml/opencl.xml
+++ b/xml/opencl.xml
@@ -156,18 +156,16 @@
       </context>
 
       <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-          <AnyChar String="fF" attribute="Float" context="#pop"/>
+          <AnyChar String="fFhH" attribute="Float" context="#pop"/>
       </context>
 
       <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
           <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
           <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
+          <AnyChar attribute="Decimal" context="#pop" String="ULJulj"/>
       </context>
 
       <context attribute="String" lineEndContext="#pop" name="String">
@@ -195,7 +193,7 @@
         <!-- define, elif, else, endif, error, if, ifdef, ifndef, include, include_next, line, pragma, undef, warning -->
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
-        <RegExpr attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Define" String="#\s*define(?:[^\\]++|\\.)++" insensitive="true" firstNonSpace="true" />
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|include(?:_next)?|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
         <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s+[0-9]+" insensitive="true" firstNonSpace="true" />
       </context>
diff --git a/xml/pascal.xml b/xml/pascal.xml
--- a/xml/pascal.xml
+++ b/xml/pascal.xml
@@ -3,7 +3,7 @@
 <language name="Pascal"
           section="Sources" 
           version="4"
-          kateversion="3.3"
+          kateversion="5.0"
           extensions="*.p;*.pas;*.pp"
           mimetype="text/x-pascal" 
           priority="8"
diff --git a/xml/perl.xml b/xml/perl.xml
--- a/xml/perl.xml
+++ b/xml/perl.xml
@@ -339,7 +339,7 @@
     </list>
     <contexts>
       <context name="normal" attribute="Normal Text" lineEndContext="#stay">
-        <RegExpr attribute="Keyword" context="#stay" String="^#!\/.*" />
+        <RegExpr attribute="Keyword" context="#stay" String="^#!\/.*" column="0" />
         <StringDetect attribute="Keyword" context="data_handle" String="__DATA__" firstNonSpace="true" />
         <StringDetect attribute="Keyword" context="#stay" String="__END__" firstNonSpace="true"/>
         <RegExpr attribute="Keyword" context="sub_name_def" String="\bsub\s+" />
diff --git a/xml/php.xml b/xml/php.xml
--- a/xml/php.xml
+++ b/xml/php.xml
@@ -73,7 +73,7 @@
   <!ENTITY types "int|integer|bool|boolean|float|double|real|string|array|object">
 ]>
 
-<language name="PHP/PHP" indenter="cstyle" version="17" kateversion="5.0" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
+<language name="PHP/PHP" indenter="cstyle" version="17" kateversion="5.53" section="Scripts" extensions="" priority="5" mimetype="" hidden="true">
   <highlighting>
     <!-- https://secure.php.net/manual/en/reserved.keywords.php -->
     <list name="control structures">
@@ -10970,27 +10970,27 @@
         <DetectChar attribute="String" context="#pop" char="'" />
       </context>
       <context name="htmlheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" column="0" />
         <IncludeRules context="commonheredoc" />
         <IncludeRules context="##HTML" />
       </context>
       <context name="cssheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" column="0" />
         <IncludeRules context="commonheredoc" />
         <IncludeRules context="##CSS" />
       </context>
       <context name="mysqlheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" column="0" />
         <IncludeRules context="commonheredoc" />
         <IncludeRules context="##SQL (MySQL)" />
       </context>
       <context name="javascriptheredoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" column="0" />
         <IncludeRules context="commonheredoc" />
         <IncludeRules context="Normal##JavaScript" />
       </context>
       <context name="heredoc" attribute="String" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Heredoc" column="0" />
         <IncludeRules context="commonheredoc" />
       </context>
       <context name="commonheredoc" attribute="String" lineEndContext="#stay">
@@ -10999,27 +10999,27 @@
         <RegExpr attribute="Variable" context="#stay" String="\{\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[([0-9]*|&quot;[a-zA-Z_]*&quot;)|'[a-zA-Z_]*'|\])*(-&gt;[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\[[a-zA-Z0-9_]*\])*(\[([0-9]*|&quot;[a-zA-Z_]*&quot;)|'[a-zA-Z_]*'|\])*)*\}" />
       </context>
       <context name="htmlnowdoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Nowdoc" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Nowdoc" column="0" />
         <IncludeRules context="commonnowdoc" />
         <IncludeRules context="##HTML" />
       </context>
       <context name="cssnowdoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Nowdoc" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Nowdoc" column="0" />
         <IncludeRules context="commonnowdoc" />
         <IncludeRules context="##CSS" />
       </context>
       <context name="mysqlnowdoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Nowdoc" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Nowdoc" column="0" />
         <IncludeRules context="commonnowdoc" />
         <IncludeRules context="##SQL (MySQL)" />
       </context>
       <context name="javascriptnowdoc" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Nowdoc" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Nowdoc" column="0" />
         <IncludeRules context="commonnowdoc" />
         <IncludeRules context="Normal##JavaScript" />
       </context>
       <context name="nowdoc" attribute="String" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Nowdoc" />
+        <RegExpr attribute="Backslash Code" context="#pop" String="^%1;?$" dynamic="true" endRegion="Nowdoc" column="0" />
         <IncludeRules context="commonnowdoc" />
       </context>
       <context name="commonnowdoc" attribute="String" lineEndContext="#stay">
diff --git a/xml/pike.xml b/xml/pike.xml
--- a/xml/pike.xml
+++ b/xml/pike.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <!-- FIXME: Find a way to prevent ranges (e.g. [1..] or [0..99]) from matching as floats. -pp -->
-<language name="Pike" version="4" kateversion="2.4" section="Scripts" extensions="*.pike" mimetype="application/x-pike;text/x-pike" casesensitive="1" author="Paul Pogonyshev" license="">
+<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>
     <list name="keywords">
       <item>break</item>
diff --git a/xml/postscript.xml b/xml/postscript.xml
--- a/xml/postscript.xml
+++ b/xml/postscript.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="PostScript" version="4" kateversion="2.2" section="Markup" extensions="*.ps;*.ai;*.eps" mimetype="application/postscript">
+<language name="PostScript" version="4" kateversion="5.0" section="Markup" extensions="*.ps;*.ai;*.eps" mimetype="application/postscript">
 <highlighting>
 	<list name="keywords">
 		<item>abs</item>
diff --git a/xml/prolog.xml b/xml/prolog.xml
--- a/xml/prolog.xml
+++ b/xml/prolog.xml
@@ -503,7 +503,7 @@
 	-->
 	    <!-- shebang: ("#!") Detect shebang and fallthrough to clause_seq -->
 	    <context name="shebang" lineEndContext="clause" lineEmptyContext="clause" attribute="Syntax Error" fallthroughContext="clause">
-		<!-- no way: fallthrough="1" fallthroughContext="clause_seq" > -->
+		<!-- no way: fallthroughContext="clause_seq" > -->
 		<Detect2Chars column="0" char="#" char1="!" context="1-comment" attribute="% italic predicates: w/ side effects" />
 		<!-- else fallthrough (workaround broken fallthrough) -->
 	    </context>
@@ -717,7 +717,7 @@
 	    <!-- "0'" or "0'\" at EOL is a syntax error, catched below.  If
 	    possible, highlight white @next line to make clear error is the nl -->
 	    <context name="syntax_error_cc" lineEndContext="#stay" attribute="Syntax Error"
-		    fallthrough="true" fallthroughContext="#pop" >
+		    fallthroughContext="#pop" >
 		<DetectSpaces context="#pop" attribute="Syntax Error" />
 	    </context>
 
@@ -732,14 +732,14 @@
 	    </context>
 	    <!-- esc_seq_cc: #pop#pop out of cc on std esc seq, else pass char back
 	    ASSERT we do NOT need the leading bs here anymore -->
-	    <context name="esc_seq_cc" fallthrough="true" fallthroughContext="#pop"
+	    <context name="esc_seq_cc" fallthroughContext="#pop"
 		    lineEndContext="#pop#pop" attribute="Syntax Error" >
 		<DetectChar char="&tab;" context="#pop#pop" attribute="Warning (!use background)" />
 		<AnyChar String="&any_esc_iso;" context="#pop#pop" attribute="escaped (!use background)" />
 	    </context>
 	    <!-- esc_seq_q2: Handle standard esc seq in quoted else pass char back
 	    ASSERT we do NOT need the leading bs here anymore -->
-	    <context name="esc_seq_q2" fallthrough="true" fallthroughContext="#pop#pop"
+	    <context name="esc_seq_q2" fallthroughContext="#pop#pop"
 		    lineEndContext="syntax_error" attribute="Syntax Error" >
 		<DetectChar char="&tab;" context="#pop#pop" attribute="Warning (!use background)" />
 		<AnyChar String="&any_esc_iso;" context="#pop#pop" attribute="escaped (!use background)" />
@@ -753,18 +753,18 @@
 	    <context name="var" attribute="Syntax Error" lineEndContext="#stay" >
 		<DetectIdentifier context="#pop" attribute="_VARIABLE" />
 	    </context>
-	    <context name="graphic" lineEndContext="#pop" attribute="Syntax Error" fallthrough="true" fallthroughContext="#pop" >
+	    <context name="graphic" lineEndContext="#pop" attribute="Syntax Error" fallthroughContext="#pop" >
 		<AnyChar String="&any_graphic_iso;" context="#stay" attribute="Normal Text" />
 	    </context>
 
 	    <!-- numbers (after "0[box]") -->
-	    <context name="bin" lineEndContext="#pop" attribute="Syntax Error" fallthrough="true" fallthroughContext="#pop" >
+	    <context name="bin" lineEndContext="#pop" attribute="Syntax Error" fallthroughContext="#pop" >
 		<AnyChar String="&any_bin_iso;" context="#stay" attribute="0b1001 0o007 0xF1" />
 	    </context>
-	    <context name="oct" lineEndContext="#pop" attribute="Syntax Error" fallthrough="true" fallthroughContext="#pop" >
+	    <context name="oct" lineEndContext="#pop" attribute="Syntax Error" fallthroughContext="#pop" >
 		<AnyChar String="&any_oct_iso;" context="#stay" attribute="0b1001 0o007 0xF1" />
 	    </context>
-	    <context name="hex" lineEndContext="#pop" attribute="Syntax Error" fallthrough="true" fallthroughContext="#pop" >
+	    <context name="hex" lineEndContext="#pop" attribute="Syntax Error" fallthroughContext="#pop" >
 		<AnyChar String="&any_hex_iso;" context="#stay" attribute="0b1001 0o007 0xF1" />
 	    </context>
 
@@ -791,7 +791,7 @@
 		<IncludeRules context="1-comment" />
 	    </context>
 	    <context name="layout_fold" lineEndContext="#stay" attribute="Syntax Error"
-		    fallthrough="true" fallthroughContext="#pop" >
+		    fallthroughContext="#pop" >
 		<DetectSpaces attribute="Normal Text" />
 		<StringDetect String="%BEGIN" context="region_marker" attribute="%BEGIN folding region"
 			    firstNonSpace="true" beginRegion="user_region" />
diff --git a/xml/protobuf.xml b/xml/protobuf.xml
--- a/xml/protobuf.xml
+++ b/xml/protobuf.xml
@@ -46,7 +46,7 @@
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Operator" context="#stay" String="operators"/>
         <keyword attribute="Data Type" context="#stay" String="datatypes"/>
-        <RegExpr attribute="Keyword" context="Imports" String="\b(package|import)\b" />
+        <RegExpr attribute="Keyword" context="Imports" String="\b(?:package|import)\b" />
         <DetectIdentifier />
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
@@ -54,20 +54,12 @@
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
         <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
-        <Float attribute="Float" context="Float Suffixes"/>
+        <Float attribute="Float" context="#stay"/>
         <HlCOct attribute="Octal" context="#stay"/>
         <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="Int Suffixes"/>
+        <Int attribute="Decimal" context="#stay"/>
         <HlCChar attribute="Char" context="#stay"/>
         <RegExpr attribute="Char" context="#stay" String="'\\u[0-9a-fA-F]{4}'"/>
-      </context>
-
-      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-          <AnyChar String="fF" attribute="Float" context="#pop"/>
-      </context>
-
-      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
       </context>
 
       <context attribute="String" lineEndContext="#pop" name="String">
diff --git a/xml/pure.xml b/xml/pure.xml
--- a/xml/pure.xml
+++ b/xml/pure.xml
@@ -32,7 +32,7 @@
  Boston, MA 02111-1307, USA.
 
 -->
-<language name="Pure" version="4" kateversion="2.4" section="Sources" extensions="*.pure">
+<language name="Pure" version="4" kateversion="5.0" section="Sources" extensions="*.pure">
   <highlighting>
     <list name="blockstarters">
       <item>case</item>
diff --git a/xml/purebasic.xml b/xml/purebasic.xml
--- a/xml/purebasic.xml
+++ b/xml/purebasic.xml
@@ -1728,8 +1728,8 @@
 
         <DetectChar attribute="String" context="String" char="&quot;" />
 
-        <RegExpr attribute="Region Marker" context="#stay" String="^\s*;+\s*BEGIN.*$" beginRegion="marker"/>
-        <RegExpr attribute="Region Marker" context="#stay" String="^\s*;+\s*END.*$" endRegion="marker"/>
+        <RegExpr attribute="Region Marker" context="#stay" String="^\s*;+\s*BEGIN.*$" beginRegion="marker" column="0"/>
+        <RegExpr attribute="Region Marker" context="#stay" String="^\s*;+\s*END.*$" endRegion="marker" column="0"/>
 
         <DetectChar attribute="Comment" context="Comment1" char=";"/>
 
diff --git a/xml/python.xml b/xml/python.xml
--- a/xml/python.xml
+++ b/xml/python.xml
@@ -393,20 +393,20 @@
 				<RegExpr attribute="String" String="u?'"                  insensitive="true" context="Single A-string"/>
 				<RegExpr attribute="String" String="u?&quot;"             insensitive="true" context="Single Q-string"/>
 
-				<RegExpr attribute="Raw String" String="(u?r|ru)'''"                insensitive="true" context="Raw Triple A-string" beginRegion="Triple A-region"/>
-				<RegExpr attribute="Raw String" String="(u?r|ru)&quot;&quot;&quot;" insensitive="true" context="Raw Triple Q-string" beginRegion="Triple Q-region"/>
-				<RegExpr attribute="Raw String" String="(u?r|ru)'"                  insensitive="true" context="Raw A-string"/>
-				<RegExpr attribute="Raw String" String="(u?r|ru)&quot;"             insensitive="true" context="Raw Q-string"/>
+				<RegExpr attribute="Raw String" String="(?:u?r|ru)'''"                insensitive="true" context="Raw Triple A-string" beginRegion="Triple A-region"/>
+				<RegExpr attribute="Raw String" String="(?:u?r|ru)&quot;&quot;&quot;" insensitive="true" context="Raw Triple Q-string" beginRegion="Triple Q-region"/>
+				<RegExpr attribute="Raw String" String="(?:u?r|ru)'"                  insensitive="true" context="Raw A-string"/>
+				<RegExpr attribute="Raw String" String="(?:u?r|ru)&quot;"             insensitive="true" context="Raw Q-string"/>
 
 				<StringDetect attribute="F-String" String="f'''"                insensitive="true" context="Triple A-F-String" beginRegion="Triple A-region"/>
 				<StringDetect attribute="F-String" String="f&quot;&quot;&quot;" insensitive="true" context="Triple Q-F-String" beginRegion="Triple Q-region"/>
 				<StringDetect attribute="F-String" String="f'"                  insensitive="true" context="Single A-F-String"/>
 				<StringDetect attribute="F-String" String="f&quot;"             insensitive="true" context="Single Q-F-String"/>
 
-				<RegExpr attribute="Raw F-String" String="(fr|rf)'''"                insensitive="true" context="Raw Triple A-F-String" beginRegion="Triple A-region"/>
-				<RegExpr attribute="Raw F-String" String="(fr|rf)&quot;&quot;&quot;" insensitive="true" context="Raw Triple Q-F-String" beginRegion="Triple Q-region"/>
-				<RegExpr attribute="Raw F-String" String="(fr|rf)'"                  insensitive="true" context="Raw A-F-String"/>
-				<RegExpr attribute="Raw F-String" String="(fr|rf)&quot;"             insensitive="true" context="Raw Q-F-String"/>
+				<RegExpr attribute="Raw F-String" String="(?:fr|rf)'''"                insensitive="true" context="Raw Triple A-F-String" beginRegion="Triple A-region"/>
+				<RegExpr attribute="Raw F-String" String="(?:fr|rf)&quot;&quot;&quot;" insensitive="true" context="Raw Triple Q-F-String" beginRegion="Triple Q-region"/>
+				<RegExpr attribute="Raw F-String" String="(?:fr|rf)'"                  insensitive="true" context="Raw A-F-String"/>
+				<RegExpr attribute="Raw F-String" String="(?:fr|rf)&quot;"             insensitive="true" context="Raw Q-F-String"/>
 			</context>
 
 			<context name="CommentVariants" attribute="Normal Text" lineEndContext="#stay">
@@ -417,10 +417,10 @@
 				<RegExpr attribute="Comment" String="u?'"                  insensitive="true" firstNonSpace="true" context="Single A-comment"/>
 				<RegExpr attribute="Comment" String="u?&quot;"             insensitive="true" firstNonSpace="true" context="Single Q-comment"/>
 
-				<RegExpr attribute="Comment" String="(u?r|ru)'''"                insensitive="true" firstNonSpace="true" context="Triple A-comment" beginRegion="Triple A-region"/>
-				<RegExpr attribute="Comment" String="(u?r|ru)&quot;&quot;&quot;" insensitive="true" firstNonSpace="true" context="Triple Q-comment" beginRegion="Triple Q-region"/>
-				<RegExpr attribute="Comment" String="(u?r|ru)'"                  insensitive="true" firstNonSpace="true" context="Single A-comment"/>
-				<RegExpr attribute="Comment" String="(u?r|ru)&quot;"             insensitive="true" firstNonSpace="true" context="Single Q-comment"/>
+				<RegExpr attribute="Comment" String="(?:u?r|ru)'''"                insensitive="true" firstNonSpace="true" context="Triple A-comment" beginRegion="Triple A-region"/>
+				<RegExpr attribute="Comment" String="(?:u?r|ru)&quot;&quot;&quot;" insensitive="true" firstNonSpace="true" context="Triple Q-comment" beginRegion="Triple Q-region"/>
+				<RegExpr attribute="Comment" String="(?:u?r|ru)'"                  insensitive="true" firstNonSpace="true" context="Single A-comment"/>
+				<RegExpr attribute="Comment" String="(?:u?r|ru)&quot;"             insensitive="true" firstNonSpace="true" context="Single Q-comment"/>
 			</context>
 
 			<context name="Dictionary" attribute="Normal Text" lineEndContext="#stay" noIndentationBasedFolding="true">
@@ -489,7 +489,7 @@
 				     7. conversion type, one of 'crsdiouxXeEfFgG%'
 				     [Special cases: %prog and %default - see http://docs.python.org/library/optparse.html]
 				-->
-				<RegExpr attribute="String Substitution" String="%((\([a-zA-Z0-9_]+\))?[#0\- +]?([1-9][0-9]*|\*)?(\.([1-9][0-9]*|\*))?[hlL]?[crsdiouxXeEfFgG%]|prog|default)" context="#stay"/>
+				<RegExpr attribute="String Substitution" String="%(?:(?:\([a-zA-Z0-9_]+\))?[#0\- +]?(?:[1-9][0-9]*|\*)?(?:\.(?:[1-9][0-9]*|\*))?[hlL]?[crsdiouxXeEfFgG%]|prog|default)" context="#stay"/>
 				<!-- http://docs.python.org/2/library/string.html#format-string-syntax:
 				     replacement_field ::=  "{" [field_name] ["!" conversion] [":" format_spec] "}"
 				     field_name        ::=  arg_name ("." attribute_name | "[" element_index "]")*
@@ -506,7 +506,7 @@
 				     precision         ::=  integer
 				     type              ::=  "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
 				-->
-				<RegExpr attribute="String Substitution" String="\{(([a-zA-Z0-9_]+|[0-9]+)(\.[a-zA-Z0-9_]+|\[[^ \]]+\])*)?(![rs])?(:([^}]?[&lt;&gt;=^])?[ +-]?#?0?[0-9]*(\.[0-9]+)?[bcdeEfFgGnosxX%]?)?\}" context="#stay"/>
+				<RegExpr attribute="String Substitution" String="\{(?:(?:[a-zA-Z0-9_]+|[0-9]+)(?:\.[a-zA-Z0-9_]+|\[[^ \]]+\])*)?(?:![rs])?(?::(?:[^}]?[&lt;&gt;=^])?[ +-]?#?0?[0-9]*(?:\.[0-9]+)?[bcdeEfFgGnosxX%]?)?\}" context="#stay"/>
 				<Detect2Chars attribute="String Substitution" char="{" char1="{" context="#stay" />
 				<Detect2Chars attribute="String Substitution" char="}" char1="}" context="#stay" />
 			</context>
@@ -531,7 +531,7 @@
 			</context>
 			<context name="String Interpolation" attribute="String Substitution" lineEndContext="#stay">
 				<DetectChar attribute="Error" char="\" context="#pop"/>
-				<RegExpr attribute="String Substitution" String="(![rs])?(:([^}]?[&lt;&gt;=^])?[ +-]?#?0?[0-9]*(\.[0-9]+)?[bcdeEfFgGnosxX%]?)?\}" context="#pop"/>
+				<RegExpr attribute="String Substitution" String="(?:![rs])?(?::(?:[^}]?[&lt;&gt;=^])?[ +-]?#?0?[0-9]*(?:\.[0-9]+)?[bcdeEfFgGnosxX%]?)?\}" context="#pop"/>
 				<IncludeRules context="Normal"/> <!-- TODO: create expression context instead -->
 			</context>
 
@@ -551,50 +551,50 @@
 			<context name="Triple A-string" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringformat"/>
-				<StringDetect attribute="String" String="'''" context="#pop#CheckForString" endRegion="Triple A-region"/>
+				<StringDetect attribute="String" String="'''" context="#pop!#CheckForString" endRegion="Triple A-region"/>
 			</context>
 
 			<context name="Raw Triple A-string" attribute="Raw String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
 				<IncludeRules context="stringformat"/>
-				<StringDetect attribute="Raw String" String="'''" context="#pop#CheckForString" endRegion="Triple A-region"/>
+				<StringDetect attribute="Raw String" String="'''" context="#pop!#CheckForString" endRegion="Triple A-region"/>
 			</context>
 
 			<context name="Triple A-F-String" attribute="F-String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringinterpolation"/>
-				<StringDetect attribute="F-String" String="'''" context="#pop#CheckForString" endRegion="Triple A-region"/>
+				<StringDetect attribute="F-String" String="'''" context="#pop!#CheckForString" endRegion="Triple A-region"/>
 			</context>
 
 			<context name="Raw Triple A-F-String" attribute="Raw F-String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="Raw F-String" context="#stay"/>
 				<IncludeRules context="stringinterpolation"/>
-				<StringDetect attribute="Raw F-String" String="'''" context="#pop#CheckForString" endRegion="Triple A-region"/>
+				<StringDetect attribute="Raw F-String" String="'''" context="#pop!#CheckForString" endRegion="Triple A-region"/>
 			</context>
 
 			<!-- Triple-quoted Q-strings -->
 			<context name="Triple Q-string" attribute="String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringformat"/>
-				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="#pop#CheckForString" endRegion="Triple Q-region"/>
+				<StringDetect attribute="String" String="&quot;&quot;&quot;" context="#pop!#CheckForString" endRegion="Triple Q-region"/>
 			</context>
 
 			<context name="Raw Triple Q-string" attribute="Raw String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
 				<IncludeRules context="stringformat"/>
-				<StringDetect attribute="Raw String" String="&quot;&quot;&quot;" context="#pop#CheckForString" endRegion="Triple Q-region"/>
+				<StringDetect attribute="Raw String" String="&quot;&quot;&quot;" context="#pop!#CheckForString" endRegion="Triple Q-region"/>
 			</context>
 
 			<context name="Triple Q-F-String" attribute="F-String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringinterpolation"/>
-				<StringDetect attribute="F-String" String="&quot;&quot;&quot;" context="#pop#CheckForString" endRegion="Triple Q-region"/>
+				<StringDetect attribute="F-String" String="&quot;&quot;&quot;" context="#pop!#CheckForString" endRegion="Triple Q-region"/>
 			</context>
 
 			<context name="Raw Triple Q-F-String" attribute="Raw F-String" lineEndContext="#stay" noIndentationBasedFolding="true">
 				<HlCStringChar attribute="Raw F-String" context="#stay"/>
 				<IncludeRules context="stringinterpolation"/>
-				<StringDetect attribute="Raw F-String" String="&quot;&quot;&quot;" context="#pop#CheckForString" endRegion="Triple Q-region"/>
+				<StringDetect attribute="Raw F-String" String="&quot;&quot;&quot;" context="#pop!#CheckForString" endRegion="Triple Q-region"/>
 			</context>
 
 
@@ -602,50 +602,50 @@
 			<context name="Single A-string" attribute="String" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringformat"/>
-				<DetectChar attribute="String" char="'" context="#pop#CheckForString"/>
+				<DetectChar attribute="String" char="'" context="#pop!#CheckForString"/>
 			</context>
 
 			<context name="Raw A-string" attribute="Raw String" lineEndContext="#stay">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
 				<IncludeRules context="stringformat"/>
-				<DetectChar attribute="Raw String" char="'" context="#pop#CheckForString"/>
+				<DetectChar attribute="Raw String" char="'" context="#pop!#CheckForString"/>
 			</context>
 
 			<context name="Single A-F-String" attribute="F-String" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringinterpolation"/>
-				<DetectChar attribute="F-String" char="'" context="#pop#CheckForString"/>
+				<DetectChar attribute="F-String" char="'" context="#pop!#CheckForString"/>
 			</context>
 
 			<context name="Raw A-F-String" attribute="Raw F-String" lineEndContext="#stay">
 				<HlCStringChar attribute="Raw F-String" context="#stay"/>
 				<IncludeRules context="stringinterpolation"/>
-				<DetectChar attribute="Raw F-String" char="'" context="#pop#CheckForString"/>
+				<DetectChar attribute="Raw F-String" char="'" context="#pop!#CheckForString"/>
 			</context>
 
 			<!-- Single-quoted Q-strings -->
 			<context name="Single Q-string" attribute="String" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringformat"/>
-				<DetectChar attribute="String" char="&quot;" context="#pop#CheckForString"/>
+				<DetectChar attribute="String" char="&quot;" context="#pop!#CheckForString"/>
 			</context>
 
 			<context name="Raw Q-string" attribute="Raw String" lineEndContext="#stay">
 				<HlCStringChar attribute="Raw String" context="#stay"/>
 				<IncludeRules context="stringformat"/>
-				<DetectChar attribute="Raw String" char="&quot;" context="#pop#CheckForString"/>
+				<DetectChar attribute="Raw String" char="&quot;" context="#pop!#CheckForString"/>
 			</context>
 
 			<context name="Single Q-F-String" attribute="F-String" lineEndContext="#stay">
 				<IncludeRules context="stringescape"/>
 				<IncludeRules context="stringinterpolation"/>
-				<DetectChar attribute="F-String" char="&quot;" context="#pop#CheckForString"/>
+				<DetectChar attribute="F-String" char="&quot;" context="#pop!#CheckForString"/>
 			</context>
 
 			<context name="Raw Q-F-String" attribute="Raw F-String" lineEndContext="#stay">
 				<HlCStringChar attribute="Raw F-String" context="#stay"/>
 				<IncludeRules context="stringinterpolation"/>
-				<DetectChar attribute="Raw F-String" char="&quot;" context="#pop#CheckForString"/>
+				<DetectChar attribute="Raw F-String" char="&quot;" context="#pop!#CheckForString"/>
 			</context>
 		</contexts>
 
diff --git a/xml/qml.xml b/xml/qml.xml
--- a/xml/qml.xml
+++ b/xml/qml.xml
@@ -4,7 +4,7 @@
   <!ENTITY identifier "[a-zA-Z_$][\w$]*">
 ]>
 <!-- Author: Milian Wolff <mail@milianw.de> -->
-<language name="QML" version="9" kateversion="5.0" section="Scripts" extensions="*.qml;*.qmltypes"
+<language name="QML" version="9" 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>
diff --git a/xml/relaxng.xml b/xml/relaxng.xml
--- a/xml/relaxng.xml
+++ b/xml/relaxng.xml
@@ -17,7 +17,7 @@
 -->
 
 <language version="6"
-          kateversion="2.4"
+          kateversion="5.0"
           name="RELAX NG"
           section="Markup"
           extensions="*.rng;*.RNG"
diff --git a/xml/relaxngcompact.xml b/xml/relaxngcompact.xml
--- a/xml/relaxngcompact.xml
+++ b/xml/relaxngcompact.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="RelaxNG-Compact" version="3" kateversion="2.4" section="Markup" extensions="*.rnc" casesensitive="1" author="Rintze Zelle" license="LGPL">
+<language name="RelaxNG-Compact" version="3" kateversion="5.0" section="Markup" extensions="*.rnc" casesensitive="1" author="Rintze Zelle" license="LGPL">
   <highlighting>
     <list name="Keywords">
       <item>default</item>
diff --git a/xml/rest.xml b/xml/rest.xml
--- a/xml/rest.xml
+++ b/xml/rest.xml
@@ -67,8 +67,8 @@
         <RegExpr attribute="Role" String=":[\w\-_\.\+]+:" context="#pop"/>
       </context>
       <context name="Comment" attribute="Comment" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Code" String="^%1   " context="#stay" column="0" dynamic="true"/>
-        <RegExpr attribute="Normal" String="^(.|$)" lookAhead="true" column="0" context="#pop"/>
+        <StringDetect attribute="Code" String="%1   " context="#stay" column="0" dynamic="true"/>
+        <RegExpr attribute="Normal" String="^." lookAhead="true" column="0" context="#pop"/>
         <IncludeRules context="##Comments"/>
       </context>
 
@@ -77,8 +77,8 @@
       </context>
 
       <context name="Code" attribute="Code" lineEndContext="#stay" dynamic="true">
-        <RegExpr attribute="Code" String="^%1" context="#stay" column="0" dynamic="true"/>
-        <RegExpr attribute="Normal" String="^(.|$)" lookAhead="true" context="#pop#pop" column="0"/>
+        <StringDetect attribute="Code" String="%1" context="#stay" column="0" dynamic="true"/>
+        <RegExpr attribute="Normal" String="^." lookAhead="true" context="#pop#pop" column="0"/>
       </context>
     </contexts>
 
diff --git a/xml/rhtml.xml b/xml/rhtml.xml
--- a/xml/rhtml.xml
+++ b/xml/rhtml.xml
@@ -489,7 +489,7 @@
 				<IncludeRules context="##Comments" />
 			</context>
 			
-			<context name="Value" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="Value NQ">
+			<context name="Value" attribute="Normal Text" lineEndContext="#stay" fallthroughContext="Value NQ">
 				<IncludeRules context="find-rubysource" />
 				
 				<DetectChar attribute="Value" context="Value DQ" char="&quot;" />
@@ -497,7 +497,7 @@
 				<DetectSpaces />
 			</context>
 			
-			<context name="Value NQ" attribute="Normal Text" lineEndContext="#pop#pop" fallthrough="true" fallthroughContext="#pop#pop">
+			<context name="Value NQ" attribute="Normal Text" lineEndContext="#pop#pop" fallthroughContext="#pop#pop">
 				<IncludeRules context="find-rubysource" />
 				
 				<IncludeRules context="FindEntityRefs" />
@@ -530,7 +530,7 @@
 			<context name="find-rubysource" attribute="Normal Text" lineEndContext="#stay">
 				<Detect2Chars attribute="Ruby Source" context="rubysource-markup" char="&lt;" char1="%" />
 			</context>
-			<context name="rubysource-markup" attribute="Ruby Source" lineEndContext="#pop!rubysource-block-content" fallthrough="true" fallthroughContext="#pop!rubysource-block-content">
+			<context name="rubysource-markup" attribute="Ruby Source" lineEndContext="#pop!rubysource-block-content" fallthroughContext="#pop!rubysource-block-content">
 				<AnyChar attribute="Ruby Source" context="#pop!rubysource-block-content" String="=-" /> <!-- <%= and <%- -->
 			</context>
 			<context name="rubysource-block-content" attribute="RUBY RAILS ERB Text" lineEndContext="#stay">
diff --git a/xml/roff.xml b/xml/roff.xml
--- a/xml/roff.xml
+++ b/xml/roff.xml
@@ -7,7 +7,7 @@
   <!ENTITY argsep1 "([^\\]|\\[&#37; |\^{}'`\-!?@)/,&amp;:~0E_acdeprtu])">
   <!ENTITY argsep2 "([^\\0-9]|\\[&#37;:{}'`\-_!@/cep])">
 ]>
-<language name="Roff" section="Markup" version="6" kateversion="2.4" extensions="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
+<language name="Roff" section="Markup" version="6" kateversion="5.0" extensions="" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="GPL">
 
   <highlighting>
 
diff --git a/xml/ruby.xml b/xml/ruby.xml
--- a/xml/ruby.xml
+++ b/xml/ruby.xml
@@ -31,7 +31,7 @@
 
 <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". -->
 <language name="Ruby" section="Scripts"
-	  version="14" kateversion="3.3"
+	  version="14" kateversion="5.0"
 	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec;Vagrantfile"
 	  mimetype="application/x-ruby"
 	  style="ruby" indenter="ruby"
diff --git a/xml/scala.xml b/xml/scala.xml
--- a/xml/scala.xml
+++ b/xml/scala.xml
@@ -1,3503 +1,315 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Scala" version="9" kateversion="2.3" section="Sources"
-          extensions="*.scala;*.sbt" mimetype="text/x-scala" license="LGPL"
-          author="Stephane Micheloud (stephane.micheloud@epfl.ch)">
-<!--
-First version added to reository was 1.0 downloaded from
-https://lampsvn.epfl.ch/trac/scala/browser/scala-tool-support/trunk/src/kate/scala.xml?format=raw
-
-adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)
--->
-  <highlighting>
-    <list name="scala2">
-      <item>Actor</item>
-      <item>ActorProxy</item>
-      <item>ActorTask</item>
-      <item>ActorThread</item>
-      <item>AllRef</item>
-      <item>Any</item>
-      <item>AnyRef</item>
-      <item>Application</item>
-      <item>AppliedType</item>
-      <item>Array</item>
-      <item>ArrayBuffer</item>
-      <item>Attribute</item>
-      <item>BoxedArray</item>
-      <item>BoxedBooleanArray</item>
-      <item>BoxedByteArray</item>
-      <item>BoxedCharArray</item>
-      <item>Buffer</item>
-      <item>BufferedIterator</item>
-      <item>Char</item>
-      <item>Console</item>
-      <item>Enumeration</item>
-      <item>Fluid</item>
-      <item>Function</item>
-      <item>IScheduler</item>
-      <item>ImmutableMapAdaptor</item>
-      <item>ImmutableSetAdaptor</item>
-      <item>Int</item>
-      <item>Iterable</item>
-      <item>List</item>
-      <item>ListBuffer</item>
-      <item>None</item>
-      <item>Option</item>
-      <item>Ordered</item>
-      <item>Pair</item>
-      <item>PartialFunction</item>
-      <item>Pid</item>
-      <item>Predef</item>
-      <item>PriorityQueue</item>
-      <item>PriorityQueueProxy</item>
-      <item>Reaction</item>
-      <item>Ref</item>
-      <item>Responder</item>
-      <item>RichInt</item>
-      <item>RichString</item>
-      <item>Rule</item>
-      <item>RuleTransformer</item>
-      <item>Script</item>
-      <item>Seq</item>
-      <item>SerialVersionUID</item>
-      <item>Some</item>
-      <item>Stream</item>
-      <item>Symbol</item>
-      <item>TcpService</item>
-      <item>TcpServiceWorker</item>
-      <item>Triple</item>
-      <item>Unit</item>
-      <item>Value</item>
-      <item>WorkerThread</item>
-      <item>serializable</item>
-      <item>transient</item>
-      <item>volatile</item>
-    </list>
-    <list name="java15">
-      <item>ACTIVE</item>
-      <item>ACTIVITY_COMPLETED</item>
-      <item>ACTIVITY_REQUIRED</item>
-      <item>ARG_IN</item>
-      <item>ARG_INOUT</item>
-      <item>ARG_OUT</item>
-      <item>AWTError</item>
-      <item>AWTEvent</item>
-      <item>AWTEventListener</item>
-      <item>AWTEventListenerProxy</item>
-      <item>AWTEventMulticaster</item>
-      <item>AWTException</item>
-      <item>AWTKeyStroke</item>
-      <item>AWTPermission</item>
-      <item>AbstractAction</item>
-      <item>AbstractBorder</item>
-      <item>AbstractButton</item>
-      <item>AbstractCellEditor</item>
-      <item>AbstractCollection</item>
-      <item>AbstractColorChooserPanel</item>
-      <item>AbstractDocument</item>
-      <item>AbstractDocument.AttributeContext</item>
-      <item>AbstractDocument.Content</item>
-      <item>AbstractDocument.ElementEdit</item>
-      <item>AbstractExecutorService</item>
-      <item>AbstractInterruptibleChannel</item>
-      <item>AbstractLayoutCache</item>
-      <item>AbstractLayoutCache.NodeDimensions</item>
-      <item>AbstractList</item>
-      <item>AbstractListModel</item>
-      <item>AbstractMap</item>
-      <item>AbstractMethodError</item>
-      <item>AbstractPreferences</item>
-      <item>AbstractQueue</item>
-      <item>AbstractQueuedSynchronizer</item>
-      <item>AbstractSelectableChannel</item>
-      <item>AbstractSelectionKey</item>
-      <item>AbstractSelector</item>
-      <item>AbstractSequentialList</item>
-      <item>AbstractSet</item>
-      <item>AbstractSpinnerModel</item>
-      <item>AbstractTableModel</item>
-      <item>AbstractUndoableEdit</item>
-      <item>AbstractWriter</item>
-      <item>AccessControlContext</item>
-      <item>AccessControlException</item>
-      <item>AccessController</item>
-      <item>AccessException</item>
-      <item>Accessible</item>
-      <item>AccessibleAction</item>
-      <item>AccessibleAttributeSequence</item>
-      <item>AccessibleBundle</item>
-      <item>AccessibleComponent</item>
-      <item>AccessibleContext</item>
-      <item>AccessibleEditableText</item>
-      <item>AccessibleExtendedComponent</item>
-      <item>AccessibleExtendedTable</item>
-      <item>AccessibleExtendedText</item>
-      <item>AccessibleHyperlink</item>
-      <item>AccessibleHypertext</item>
-      <item>AccessibleIcon</item>
-      <item>AccessibleKeyBinding</item>
-      <item>AccessibleObject</item>
-      <item>AccessibleRelation</item>
-      <item>AccessibleRelationSet</item>
-      <item>AccessibleResourceBundle</item>
-      <item>AccessibleRole</item>
-      <item>AccessibleSelection</item>
-      <item>AccessibleState</item>
-      <item>AccessibleStateSet</item>
-      <item>AccessibleStreamable</item>
-      <item>AccessibleTable</item>
-      <item>AccessibleTableModelChange</item>
-      <item>AccessibleText</item>
-      <item>AccessibleTextSequence</item>
-      <item>AccessibleValue</item>
-      <item>AccountException</item>
-      <item>AccountExpiredException</item>
-      <item>AccountLockedException</item>
-      <item>AccountNotFoundException</item>
-      <item>Acl</item>
-      <item>AclEntry</item>
-      <item>AclNotFoundException</item>
-      <item>Action</item>
-      <item>ActionEvent</item>
-      <item>ActionListener</item>
-      <item>ActionMap</item>
-      <item>ActionMapUIResource</item>
-      <item>Activatable</item>
-      <item>ActivateFailedException</item>
-      <item>ActivationDesc</item>
-      <item>ActivationException</item>
-      <item>ActivationGroup</item>
-      <item>ActivationGroupDesc</item>
-      <item>ActivationGroupDesc.CommandEnvironment</item>
-      <item>ActivationGroupID</item>
-      <item>ActivationGroup_Stub</item>
-      <item>ActivationID</item>
-      <item>ActivationInstantiator</item>
-      <item>ActivationMonitor</item>
-      <item>ActivationSystem</item>
-      <item>Activator</item>
-      <item>ActiveEvent</item>
-      <item>ActivityCompletedException</item>
-      <item>ActivityRequiredException</item>
-      <item>AdapterActivator</item>
-      <item>AdapterActivatorOperations</item>
-      <item>AdapterAlreadyExists</item>
-      <item>AdapterAlreadyExistsHelper</item>
-      <item>AdapterInactive</item>
-      <item>AdapterInactiveHelper</item>
-      <item>AdapterManagerIdHelper</item>
-      <item>AdapterNameHelper</item>
-      <item>AdapterNonExistent</item>
-      <item>AdapterNonExistentHelper</item>
-      <item>AdapterStateHelper</item>
-      <item>AddressHelper</item>
-      <item>Adjustable</item>
-      <item>AdjustmentEvent</item>
-      <item>AdjustmentListener</item>
-      <item>Adler32</item>
-      <item>AffineTransform</item>
-      <item>AffineTransformOp</item>
-      <item>AlgorithmParameterGenerator</item>
-      <item>AlgorithmParameterGeneratorSpi</item>
-      <item>AlgorithmParameterSpec</item>
-      <item>AlgorithmParameters</item>
-      <item>AlgorithmParametersSpi</item>
-      <item>AllPermission</item>
-      <item>AlphaComposite</item>
-      <item>AlreadyBound</item>
-      <item>AlreadyBoundException</item>
-      <item>AlreadyBoundHelper</item>
-      <item>AlreadyBoundHolder</item>
-      <item>AlreadyConnectedException</item>
-      <item>AncestorEvent</item>
-      <item>AncestorListener</item>
-      <item>AnnotatedElement</item>
-      <item>Annotation</item>
-      <item>Annotation</item>
-      <item>AnnotationFormatError</item>
-      <item>AnnotationTypeMismatchException</item>
-      <item>Any</item>
-      <item>AnyHolder</item>
-      <item>AnySeqHelper</item>
-      <item>AnySeqHelper</item>
-      <item>AnySeqHolder</item>
-      <item>AppConfigurationEntry</item>
-      <item>AppConfigurationEntry.LoginModuleControlFlag</item>
-      <item>Appendable</item>
-      <item>Applet</item>
-      <item>AppletContext</item>
-      <item>AppletInitializer</item>
-      <item>AppletStub</item>
-      <item>ApplicationException</item>
-      <item>Arc2D</item>
-      <item>Arc2D.Double</item>
-      <item>Arc2D.Float</item>
-      <item>Area</item>
-      <item>AreaAveragingScaleFilter</item>
-      <item>ArithmeticException</item>
-      <item>Array</item>
-      <item>Array</item>
-      <item>ArrayBlockingQueue</item>
-      <item>ArrayIndexOutOfBoundsException</item>
-      <item>ArrayList</item>
-      <item>ArrayStoreException</item>
-      <item>ArrayType</item>
-      <item>Arrays</item>
-      <item>AssertionError</item>
-      <item>AsyncBoxView</item>
-      <item>AsynchronousCloseException</item>
-      <item>AtomicBoolean</item>
-      <item>AtomicInteger</item>
-      <item>AtomicIntegerArray</item>
-      <item>AtomicIntegerFieldUpdater</item>
-      <item>AtomicLong</item>
-      <item>AtomicLongArray</item>
-      <item>AtomicLongFieldUpdater</item>
-      <item>AtomicMarkableReference</item>
-      <item>AtomicReference</item>
-      <item>AtomicReferenceArray</item>
-      <item>AtomicReferenceFieldUpdater</item>
-      <item>AtomicStampedReference</item>
-      <item>Attr</item>
-      <item>Attribute</item>
-      <item>Attribute</item>
-      <item>Attribute</item>
-      <item>AttributeChangeNotification</item>
-      <item>AttributeChangeNotificationFilter</item>
-      <item>AttributeException</item>
-      <item>AttributeInUseException</item>
-      <item>AttributeList</item>
-      <item>AttributeList</item>
-      <item>AttributeList</item>
-      <item>AttributeListImpl</item>
-      <item>AttributeModificationException</item>
-      <item>AttributeNotFoundException</item>
-      <item>AttributeSet</item>
-      <item>AttributeSet</item>
-      <item>AttributeSet.CharacterAttribute</item>
-      <item>AttributeSet.ColorAttribute</item>
-      <item>AttributeSet.FontAttribute</item>
-      <item>AttributeSet.ParagraphAttribute</item>
-      <item>AttributeSetUtilities</item>
-      <item>AttributeValueExp</item>
-      <item>AttributedCharacterIterator</item>
-      <item>AttributedCharacterIterator.Attribute</item>
-      <item>AttributedString</item>
-      <item>Attributes</item>
-      <item>Attributes</item>
-      <item>Attributes</item>
-      <item>Attributes.Name</item>
-      <item>Attributes2</item>
-      <item>Attributes2Impl</item>
-      <item>AttributesImpl</item>
-      <item>AudioClip</item>
-      <item>AudioFileFormat</item>
-      <item>AudioFileFormat.Type</item>
-      <item>AudioFileReader</item>
-      <item>AudioFileWriter</item>
-      <item>AudioFormat</item>
-      <item>AudioFormat.Encoding</item>
-      <item>AudioInputStream</item>
-      <item>AudioPermission</item>
-      <item>AudioSystem</item>
-      <item>AuthPermission</item>
-      <item>AuthProvider</item>
-      <item>AuthenticationException</item>
-      <item>AuthenticationException</item>
-      <item>AuthenticationNotSupportedException</item>
-      <item>Authenticator</item>
-      <item>Authenticator.RequestorType</item>
-      <item>AuthorizeCallback</item>
-      <item>Autoscroll</item>
-      <item>BAD_CONTEXT</item>
-      <item>BAD_INV_ORDER</item>
-      <item>BAD_OPERATION</item>
-      <item>BAD_PARAM</item>
-      <item>BAD_POLICY</item>
-      <item>BAD_POLICY_TYPE</item>
-      <item>BAD_POLICY_VALUE</item>
-      <item>BAD_QOS</item>
-      <item>BAD_TYPECODE</item>
-      <item>BMPImageWriteParam</item>
-      <item>BackingStoreException</item>
-      <item>BadAttributeValueExpException</item>
-      <item>BadBinaryOpValueExpException</item>
-      <item>BadKind</item>
-      <item>BadLocationException</item>
-      <item>BadPaddingException</item>
-      <item>BadStringOperationException</item>
-      <item>BandCombineOp</item>
-      <item>BandedSampleModel</item>
-      <item>BaseRowSet</item>
-      <item>BasicArrowButton</item>
-      <item>BasicAttribute</item>
-      <item>BasicAttributes</item>
-      <item>BasicBorders</item>
-      <item>BasicBorders.ButtonBorder</item>
-      <item>BasicBorders.FieldBorder</item>
-      <item>BasicBorders.MarginBorder</item>
-      <item>BasicBorders.MenuBarBorder</item>
-      <item>BasicBorders.RadioButtonBorder</item>
-      <item>BasicBorders.RolloverButtonBorder</item>
-      <item>BasicBorders.SplitPaneBorder</item>
-      <item>BasicBorders.ToggleButtonBorder</item>
-      <item>BasicButtonListener</item>
-      <item>BasicButtonUI</item>
-      <item>BasicCheckBoxMenuItemUI</item>
-      <item>BasicCheckBoxUI</item>
-      <item>BasicColorChooserUI</item>
-      <item>BasicComboBoxEditor</item>
-      <item>BasicComboBoxEditor.UIResource</item>
-      <item>BasicComboBoxRenderer</item>
-      <item>BasicComboBoxRenderer.UIResource</item>
-      <item>BasicComboBoxUI</item>
-      <item>BasicComboPopup</item>
-      <item>BasicControl</item>
-      <item>BasicDesktopIconUI</item>
-      <item>BasicDesktopPaneUI</item>
-      <item>BasicDirectoryModel</item>
-      <item>BasicEditorPaneUI</item>
-      <item>BasicFileChooserUI</item>
-      <item>BasicFormattedTextFieldUI</item>
-      <item>BasicGraphicsUtils</item>
-      <item>BasicHTML</item>
-      <item>BasicIconFactory</item>
-      <item>BasicInternalFrameTitlePane</item>
-      <item>BasicInternalFrameUI</item>
-      <item>BasicLabelUI</item>
-      <item>BasicListUI</item>
-      <item>BasicLookAndFeel</item>
-      <item>BasicMenuBarUI</item>
-      <item>BasicMenuItemUI</item>
-      <item>BasicMenuUI</item>
-      <item>BasicOptionPaneUI</item>
-      <item>BasicOptionPaneUI.ButtonAreaLayout</item>
-      <item>BasicPanelUI</item>
-      <item>BasicPasswordFieldUI</item>
-      <item>BasicPermission</item>
-      <item>BasicPopupMenuSeparatorUI</item>
-      <item>BasicPopupMenuUI</item>
-      <item>BasicProgressBarUI</item>
-      <item>BasicRadioButtonMenuItemUI</item>
-      <item>BasicRadioButtonUI</item>
-      <item>BasicRootPaneUI</item>
-      <item>BasicScrollBarUI</item>
-      <item>BasicScrollPaneUI</item>
-      <item>BasicSeparatorUI</item>
-      <item>BasicSliderUI</item>
-      <item>BasicSpinnerUI</item>
-      <item>BasicSplitPaneDivider</item>
-      <item>BasicSplitPaneUI</item>
-      <item>BasicStroke</item>
-      <item>BasicTabbedPaneUI</item>
-      <item>BasicTableHeaderUI</item>
-      <item>BasicTableUI</item>
-      <item>BasicTextAreaUI</item>
-      <item>BasicTextFieldUI</item>
-      <item>BasicTextPaneUI</item>
-      <item>BasicTextUI</item>
-      <item>BasicTextUI.BasicCaret</item>
-      <item>BasicTextUI.BasicHighlighter</item>
-      <item>BasicToggleButtonUI</item>
-      <item>BasicToolBarSeparatorUI</item>
-      <item>BasicToolBarUI</item>
-      <item>BasicToolTipUI</item>
-      <item>BasicTreeUI</item>
-      <item>BasicViewportUI</item>
-      <item>BatchUpdateException</item>
-      <item>BeanContext</item>
-      <item>BeanContextChild</item>
-      <item>BeanContextChildComponentProxy</item>
-      <item>BeanContextChildSupport</item>
-      <item>BeanContextContainerProxy</item>
-      <item>BeanContextEvent</item>
-      <item>BeanContextMembershipEvent</item>
-      <item>BeanContextMembershipListener</item>
-      <item>BeanContextProxy</item>
-      <item>BeanContextServiceAvailableEvent</item>
-      <item>BeanContextServiceProvider</item>
-      <item>BeanContextServiceProviderBeanInfo</item>
-      <item>BeanContextServiceRevokedEvent</item>
-      <item>BeanContextServiceRevokedListener</item>
-      <item>BeanContextServices</item>
-      <item>BeanContextServicesListener</item>
-      <item>BeanContextServicesSupport</item>
-      <item>BeanContextServicesSupport.BCSSServiceProvider</item>
-      <item>BeanContextSupport</item>
-      <item>BeanContextSupport.BCSIterator</item>
-      <item>BeanDescriptor</item>
-      <item>BeanInfo</item>
-      <item>Beans</item>
-      <item>BevelBorder</item>
-      <item>Bidi</item>
-      <item>BigDecimal</item>
-      <item>BigInteger</item>
-      <item>BinaryRefAddr</item>
-      <item>BindException</item>
-      <item>Binding</item>
-      <item>Binding</item>
-      <item>BindingHelper</item>
-      <item>BindingHolder</item>
-      <item>BindingIterator</item>
-      <item>BindingIteratorHelper</item>
-      <item>BindingIteratorHolder</item>
-      <item>BindingIteratorOperations</item>
-      <item>BindingIteratorPOA</item>
-      <item>BindingListHelper</item>
-      <item>BindingListHolder</item>
-      <item>BindingType</item>
-      <item>BindingTypeHelper</item>
-      <item>BindingTypeHolder</item>
-      <item>BitSet</item>
-      <item>Blob</item>
-      <item>BlockView</item>
-      <item>BlockingQueue</item>
-      <item>Book</item>
-      <item>Boolean</item>
-      <item>BooleanControl</item>
-      <item>BooleanControl.Type</item>
-      <item>BooleanHolder</item>
-      <item>BooleanSeqHelper</item>
-      <item>BooleanSeqHolder</item>
-      <item>Border</item>
-      <item>BorderFactory</item>
-      <item>BorderLayout</item>
-      <item>BorderUIResource</item>
-      <item>BorderUIResource.BevelBorderUIResource</item>
-      <item>BorderUIResource.CompoundBorderUIResource</item>
-      <item>BorderUIResource.EmptyBorderUIResource</item>
-      <item>BorderUIResource.EtchedBorderUIResource</item>
-      <item>BorderUIResource.LineBorderUIResource</item>
-      <item>BorderUIResource.MatteBorderUIResource</item>
-      <item>BorderUIResource.TitledBorderUIResource</item>
-      <item>BoundedRangeModel</item>
-      <item>Bounds</item>
-      <item>Bounds</item>
-      <item>Box</item>
-      <item>Box.Filler</item>
-      <item>BoxLayout</item>
-      <item>BoxView</item>
-      <item>BoxedValueHelper</item>
-      <item>BreakIterator</item>
-      <item>BrokenBarrierException</item>
-      <item>Buffer</item>
-      <item>BufferCapabilities</item>
-      <item>BufferCapabilities.FlipContents</item>
-      <item>BufferOverflowException</item>
-      <item>BufferStrategy</item>
-      <item>BufferUnderflowException</item>
-      <item>BufferedImage</item>
-      <item>BufferedImageFilter</item>
-      <item>BufferedImageOp</item>
-      <item>BufferedInputStream</item>
-      <item>BufferedOutputStream</item>
-      <item>BufferedReader</item>
-      <item>BufferedWriter</item>
-      <item>Button</item>
-      <item>ButtonGroup</item>
-      <item>ButtonModel</item>
-      <item>ButtonUI</item>
-      <item>Byte</item>
-      <item>ByteArrayInputStream</item>
-      <item>ByteArrayOutputStream</item>
-      <item>ByteBuffer</item>
-      <item>ByteChannel</item>
-      <item>ByteHolder</item>
-      <item>ByteLookupTable</item>
-      <item>ByteOrder</item>
-      <item>CDATASection</item>
-      <item>CMMException</item>
-      <item>CODESET_INCOMPATIBLE</item>
-      <item>COMM_FAILURE</item>
-      <item>CRC32</item>
-      <item>CRL</item>
-      <item>CRLException</item>
-      <item>CRLSelector</item>
-      <item>CSS</item>
-      <item>CSS.Attribute</item>
-      <item>CTX_RESTRICT_SCOPE</item>
-      <item>CacheRequest</item>
-      <item>CacheResponse</item>
-      <item>CachedRowSet</item>
-      <item>Calendar</item>
-      <item>Callable</item>
-      <item>CallableStatement</item>
-      <item>Callback</item>
-      <item>CallbackHandler</item>
-      <item>CancelablePrintJob</item>
-      <item>CancellationException</item>
-      <item>CancelledKeyException</item>
-      <item>CannotProceed</item>
-      <item>CannotProceedException</item>
-      <item>CannotProceedHelper</item>
-      <item>CannotProceedHolder</item>
-      <item>CannotRedoException</item>
-      <item>CannotUndoException</item>
-      <item>Canvas</item>
-      <item>CardLayout</item>
-      <item>Caret</item>
-      <item>CaretEvent</item>
-      <item>CaretListener</item>
-      <item>CellEditor</item>
-      <item>CellEditorListener</item>
-      <item>CellRendererPane</item>
-      <item>CertPath</item>
-      <item>CertPath.CertPathRep</item>
-      <item>CertPathBuilder</item>
-      <item>CertPathBuilderException</item>
-      <item>CertPathBuilderResult</item>
-      <item>CertPathBuilderSpi</item>
-      <item>CertPathParameters</item>
-      <item>CertPathTrustManagerParameters</item>
-      <item>CertPathValidator</item>
-      <item>CertPathValidatorException</item>
-      <item>CertPathValidatorResult</item>
-      <item>CertPathValidatorSpi</item>
-      <item>CertSelector</item>
-      <item>CertStore</item>
-      <item>CertStoreException</item>
-      <item>CertStoreParameters</item>
-      <item>CertStoreSpi</item>
-      <item>Certificate</item>
-      <item>Certificate</item>
-      <item>Certificate</item>
-      <item>Certificate.CertificateRep</item>
-      <item>CertificateEncodingException</item>
-      <item>CertificateEncodingException</item>
-      <item>CertificateException</item>
-      <item>CertificateException</item>
-      <item>CertificateExpiredException</item>
-      <item>CertificateExpiredException</item>
-      <item>CertificateFactory</item>
-      <item>CertificateFactorySpi</item>
-      <item>CertificateNotYetValidException</item>
-      <item>CertificateNotYetValidException</item>
-      <item>CertificateParsingException</item>
-      <item>CertificateParsingException</item>
-      <item>ChangeEvent</item>
-      <item>ChangeListener</item>
-      <item>ChangedCharSetException</item>
-      <item>Channel</item>
-      <item>ChannelBinding</item>
-      <item>Channels</item>
-      <item>CharArrayReader</item>
-      <item>CharArrayWriter</item>
-      <item>CharBuffer</item>
-      <item>CharConversionException</item>
-      <item>CharHolder</item>
-      <item>CharSeqHelper</item>
-      <item>CharSeqHolder</item>
-      <item>CharSequence</item>
-      <item>Character</item>
-      <item>Character.Subset</item>
-      <item>Character.UnicodeBlock</item>
-      <item>CharacterCodingException</item>
-      <item>CharacterData</item>
-      <item>CharacterIterator</item>
-      <item>Charset</item>
-      <item>CharsetDecoder</item>
-      <item>CharsetEncoder</item>
-      <item>CharsetProvider</item>
-      <item>Checkbox</item>
-      <item>CheckboxGroup</item>
-      <item>CheckboxMenuItem</item>
-      <item>CheckedInputStream</item>
-      <item>CheckedOutputStream</item>
-      <item>Checksum</item>
-      <item>Choice</item>
-      <item>ChoiceCallback</item>
-      <item>ChoiceFormat</item>
-      <item>Chromaticity</item>
-      <item>Cipher</item>
-      <item>CipherInputStream</item>
-      <item>CipherOutputStream</item>
-      <item>CipherSpi</item>
-      <item>Class</item>
-      <item>ClassCastException</item>
-      <item>ClassCircularityError</item>
-      <item>ClassDefinition</item>
-      <item>ClassDesc</item>
-      <item>ClassFileTransformer</item>
-      <item>ClassFormatError</item>
-      <item>ClassLoader</item>
-      <item>ClassLoaderRepository</item>
-      <item>ClassLoadingMXBean</item>
-      <item>ClassNotFoundException</item>
-      <item>ClientRequestInfo</item>
-      <item>ClientRequestInfoOperations</item>
-      <item>ClientRequestInterceptor</item>
-      <item>ClientRequestInterceptorOperations</item>
-      <item>Clip</item>
-      <item>Clipboard</item>
-      <item>ClipboardOwner</item>
-      <item>Clob</item>
-      <item>CloneNotSupportedException</item>
-      <item>Cloneable</item>
-      <item>Closeable</item>
-      <item>ClosedByInterruptException</item>
-      <item>ClosedChannelException</item>
-      <item>ClosedSelectorException</item>
-      <item>CodeSets</item>
-      <item>CodeSigner</item>
-      <item>CodeSource</item>
-      <item>Codec</item>
-      <item>CodecFactory</item>
-      <item>CodecFactoryHelper</item>
-      <item>CodecFactoryOperations</item>
-      <item>CodecOperations</item>
-      <item>CoderMalfunctionError</item>
-      <item>CoderResult</item>
-      <item>CodingErrorAction</item>
-      <item>CollationElementIterator</item>
-      <item>CollationKey</item>
-      <item>Collator</item>
-      <item>Collection</item>
-      <item>CollectionCertStoreParameters</item>
-      <item>Collections</item>
-      <item>Color</item>
-      <item>ColorChooserComponentFactory</item>
-      <item>ColorChooserUI</item>
-      <item>ColorConvertOp</item>
-      <item>ColorModel</item>
-      <item>ColorSelectionModel</item>
-      <item>ColorSpace</item>
-      <item>ColorSupported</item>
-      <item>ColorType</item>
-      <item>ColorUIResource</item>
-      <item>ComboBoxEditor</item>
-      <item>ComboBoxModel</item>
-      <item>ComboBoxUI</item>
-      <item>ComboPopup</item>
-      <item>Comment</item>
-      <item>CommunicationException</item>
-      <item>Comparable</item>
-      <item>Comparator</item>
-      <item>CompilationMXBean</item>
-      <item>Compiler</item>
-      <item>CompletionService</item>
-      <item>CompletionStatus</item>
-      <item>CompletionStatusHelper</item>
-      <item>Component</item>
-      <item>ComponentAdapter</item>
-      <item>ComponentColorModel</item>
-      <item>ComponentEvent</item>
-      <item>ComponentIdHelper</item>
-      <item>ComponentInputMap</item>
-      <item>ComponentInputMapUIResource</item>
-      <item>ComponentListener</item>
-      <item>ComponentOrientation</item>
-      <item>ComponentSampleModel</item>
-      <item>ComponentUI</item>
-      <item>ComponentView</item>
-      <item>Composite</item>
-      <item>CompositeContext</item>
-      <item>CompositeData</item>
-      <item>CompositeDataSupport</item>
-      <item>CompositeName</item>
-      <item>CompositeType</item>
-      <item>CompositeView</item>
-      <item>CompoundBorder</item>
-      <item>CompoundControl</item>
-      <item>CompoundControl.Type</item>
-      <item>CompoundEdit</item>
-      <item>CompoundName</item>
-      <item>Compression</item>
-      <item>ConcurrentHashMap</item>
-      <item>ConcurrentLinkedQueue</item>
-      <item>ConcurrentMap</item>
-      <item>ConcurrentModificationException</item>
-      <item>Condition</item>
-      <item>Configuration</item>
-      <item>ConfigurationException</item>
-      <item>ConfirmationCallback</item>
-      <item>ConnectException</item>
-      <item>ConnectException</item>
-      <item>ConnectIOException</item>
-      <item>Connection</item>
-      <item>ConnectionEvent</item>
-      <item>ConnectionEventListener</item>
-      <item>ConnectionPendingException</item>
-      <item>ConnectionPoolDataSource</item>
-      <item>ConsoleHandler</item>
-      <item>Constructor</item>
-      <item>Container</item>
-      <item>ContainerAdapter</item>
-      <item>ContainerEvent</item>
-      <item>ContainerListener</item>
-      <item>ContainerOrderFocusTraversalPolicy</item>
-      <item>ContentHandler</item>
-      <item>ContentHandler</item>
-      <item>ContentHandlerFactory</item>
-      <item>ContentModel</item>
-      <item>Context</item>
-      <item>Context</item>
-      <item>ContextList</item>
-      <item>ContextNotEmptyException</item>
-      <item>ContextualRenderedImageFactory</item>
-      <item>Control</item>
-      <item>Control</item>
-      <item>Control.Type</item>
-      <item>ControlFactory</item>
-      <item>ControllerEventListener</item>
-      <item>ConvolveOp</item>
-      <item>CookieHandler</item>
-      <item>CookieHolder</item>
-      <item>Copies</item>
-      <item>CopiesSupported</item>
-      <item>CopyOnWriteArrayList</item>
-      <item>CopyOnWriteArraySet</item>
-      <item>CountDownLatch</item>
-      <item>CounterMonitor</item>
-      <item>CounterMonitorMBean</item>
-      <item>CredentialException</item>
-      <item>CredentialExpiredException</item>
-      <item>CredentialNotFoundException</item>
-      <item>CropImageFilter</item>
-      <item>CubicCurve2D</item>
-      <item>CubicCurve2D.Double</item>
-      <item>CubicCurve2D.Float</item>
-      <item>Currency</item>
-      <item>Current</item>
-      <item>Current</item>
-      <item>Current</item>
-      <item>CurrentHelper</item>
-      <item>CurrentHelper</item>
-      <item>CurrentHelper</item>
-      <item>CurrentHolder</item>
-      <item>CurrentOperations</item>
-      <item>CurrentOperations</item>
-      <item>CurrentOperations</item>
-      <item>Cursor</item>
-      <item>CustomMarshal</item>
-      <item>CustomValue</item>
-      <item>Customizer</item>
-      <item>CyclicBarrier</item>
-      <item>DATA_CONVERSION</item>
-      <item>DESKeySpec</item>
-      <item>DESedeKeySpec</item>
-      <item>DGC</item>
-      <item>DHGenParameterSpec</item>
-      <item>DHKey</item>
-      <item>DHParameterSpec</item>
-      <item>DHPrivateKey</item>
-      <item>DHPrivateKeySpec</item>
-      <item>DHPublicKey</item>
-      <item>DHPublicKeySpec</item>
-      <item>DISCARDING</item>
-      <item>DOMConfiguration</item>
-      <item>DOMError</item>
-      <item>DOMErrorHandler</item>
-      <item>DOMException</item>
-      <item>DOMImplementation</item>
-      <item>DOMImplementationLS</item>
-      <item>DOMImplementationList</item>
-      <item>DOMImplementationRegistry</item>
-      <item>DOMImplementationSource</item>
-      <item>DOMLocator</item>
-      <item>DOMLocator</item>
-      <item>DOMResult</item>
-      <item>DOMSource</item>
-      <item>DOMStringList</item>
-      <item>DSAKey</item>
-      <item>DSAKeyPairGenerator</item>
-      <item>DSAParameterSpec</item>
-      <item>DSAParams</item>
-      <item>DSAPrivateKey</item>
-      <item>DSAPrivateKeySpec</item>
-      <item>DSAPublicKey</item>
-      <item>DSAPublicKeySpec</item>
-      <item>DTD</item>
-      <item>DTDConstants</item>
-      <item>DTDHandler</item>
-      <item>DataBuffer</item>
-      <item>DataBufferByte</item>
-      <item>DataBufferDouble</item>
-      <item>DataBufferFloat</item>
-      <item>DataBufferInt</item>
-      <item>DataBufferShort</item>
-      <item>DataBufferUShort</item>
-      <item>DataFlavor</item>
-      <item>DataFormatException</item>
-      <item>DataInput</item>
-      <item>DataInputStream</item>
-      <item>DataInputStream</item>
-      <item>DataLine</item>
-      <item>DataLine.Info</item>
-      <item>DataOutput</item>
-      <item>DataOutputStream</item>
-      <item>DataOutputStream</item>
-      <item>DataSource</item>
-      <item>DataTruncation</item>
-      <item>DatabaseMetaData</item>
-      <item>DatagramChannel</item>
-      <item>DatagramPacket</item>
-      <item>DatagramSocket</item>
-      <item>DatagramSocketImpl</item>
-      <item>DatagramSocketImplFactory</item>
-      <item>DatatypeConfigurationException</item>
-      <item>DatatypeConstants</item>
-      <item>DatatypeConstants.Field</item>
-      <item>DatatypeFactory</item>
-      <item>Date</item>
-      <item>Date</item>
-      <item>DateFormat</item>
-      <item>DateFormat.Field</item>
-      <item>DateFormatSymbols</item>
-      <item>DateFormatter</item>
-      <item>DateTimeAtCompleted</item>
-      <item>DateTimeAtCreation</item>
-      <item>DateTimeAtProcessing</item>
-      <item>DateTimeSyntax</item>
-      <item>DebugGraphics</item>
-      <item>DecimalFormat</item>
-      <item>DecimalFormatSymbols</item>
-      <item>DeclHandler</item>
-      <item>DefaultBoundedRangeModel</item>
-      <item>DefaultButtonModel</item>
-      <item>DefaultCaret</item>
-      <item>DefaultCellEditor</item>
-      <item>DefaultColorSelectionModel</item>
-      <item>DefaultComboBoxModel</item>
-      <item>DefaultDesktopManager</item>
-      <item>DefaultEditorKit</item>
-      <item>DefaultEditorKit.BeepAction</item>
-      <item>DefaultEditorKit.CopyAction</item>
-      <item>DefaultEditorKit.CutAction</item>
-      <item>DefaultEditorKit.DefaultKeyTypedAction</item>
-      <item>DefaultEditorKit.InsertBreakAction</item>
-      <item>DefaultEditorKit.InsertContentAction</item>
-      <item>DefaultEditorKit.InsertTabAction</item>
-      <item>DefaultEditorKit.PasteAction</item>
-      <item>DefaultFocusManager</item>
-      <item>DefaultFocusTraversalPolicy</item>
-      <item>DefaultFormatter</item>
-      <item>DefaultFormatterFactory</item>
-      <item>DefaultHandler</item>
-      <item>DefaultHandler2</item>
-      <item>DefaultHighlighter</item>
-      <item>DefaultHighlighter.DefaultHighlightPainter</item>
-      <item>DefaultKeyboardFocusManager</item>
-      <item>DefaultListCellRenderer</item>
-      <item>DefaultListCellRenderer.UIResource</item>
-      <item>DefaultListModel</item>
-      <item>DefaultListSelectionModel</item>
-      <item>DefaultLoaderRepository</item>
-      <item>DefaultLoaderRepository</item>
-      <item>DefaultMenuLayout</item>
-      <item>DefaultMetalTheme</item>
-      <item>DefaultMutableTreeNode</item>
-      <item>DefaultPersistenceDelegate</item>
-      <item>DefaultSingleSelectionModel</item>
-      <item>DefaultStyledDocument</item>
-      <item>DefaultStyledDocument.AttributeUndoableEdit</item>
-      <item>DefaultStyledDocument.ElementSpec</item>
-      <item>DefaultTableCellRenderer</item>
-      <item>DefaultTableCellRenderer.UIResource</item>
-      <item>DefaultTableColumnModel</item>
-      <item>DefaultTableModel</item>
-      <item>DefaultTextUI</item>
-      <item>DefaultTreeCellEditor</item>
-      <item>DefaultTreeCellRenderer</item>
-      <item>DefaultTreeModel</item>
-      <item>DefaultTreeSelectionModel</item>
-      <item>DefinitionKind</item>
-      <item>DefinitionKindHelper</item>
-      <item>Deflater</item>
-      <item>DeflaterOutputStream</item>
-      <item>DelayQueue</item>
-      <item>Delayed</item>
-      <item>Delegate</item>
-      <item>Delegate</item>
-      <item>Delegate</item>
-      <item>DelegationPermission</item>
-      <item>Deprecated</item>
-      <item>Descriptor</item>
-      <item>DescriptorAccess</item>
-      <item>DescriptorSupport</item>
-      <item>DesignMode</item>
-      <item>DesktopIconUI</item>
-      <item>DesktopManager</item>
-      <item>DesktopPaneUI</item>
-      <item>Destination</item>
-      <item>DestroyFailedException</item>
-      <item>Destroyable</item>
-      <item>Dialog</item>
-      <item>Dictionary</item>
-      <item>DigestException</item>
-      <item>DigestInputStream</item>
-      <item>DigestOutputStream</item>
-      <item>Dimension</item>
-      <item>Dimension2D</item>
-      <item>DimensionUIResource</item>
-      <item>DirContext</item>
-      <item>DirObjectFactory</item>
-      <item>DirStateFactory</item>
-      <item>DirStateFactory.Result</item>
-      <item>DirectColorModel</item>
-      <item>DirectoryManager</item>
-      <item>DisplayMode</item>
-      <item>DnDConstants</item>
-      <item>Doc</item>
-      <item>DocAttribute</item>
-      <item>DocAttributeSet</item>
-      <item>DocFlavor</item>
-      <item>DocFlavor.BYTE_ARRAY</item>
-      <item>DocFlavor.CHAR_ARRAY</item>
-      <item>DocFlavor.INPUT_STREAM</item>
-      <item>DocFlavor.READER</item>
-      <item>DocFlavor.SERVICE_FORMATTED</item>
-      <item>DocFlavor.STRING</item>
-      <item>DocFlavor.URL</item>
-      <item>DocPrintJob</item>
-      <item>Document</item>
-      <item>Document</item>
-      <item>DocumentBuilder</item>
-      <item>DocumentBuilderFactory</item>
-      <item>DocumentEvent</item>
-      <item>DocumentEvent.ElementChange</item>
-      <item>DocumentEvent.EventType</item>
-      <item>DocumentFilter</item>
-      <item>DocumentFilter.FilterBypass</item>
-      <item>DocumentFragment</item>
-      <item>DocumentHandler</item>
-      <item>DocumentListener</item>
-      <item>DocumentName</item>
-      <item>DocumentParser</item>
-      <item>DocumentType</item>
-      <item>Documented</item>
-      <item>DomainCombiner</item>
-      <item>DomainManager</item>
-      <item>DomainManagerOperations</item>
-      <item>Double</item>
-      <item>DoubleBuffer</item>
-      <item>DoubleHolder</item>
-      <item>DoubleSeqHelper</item>
-      <item>DoubleSeqHolder</item>
-      <item>DragGestureEvent</item>
-      <item>DragGestureListener</item>
-      <item>DragGestureRecognizer</item>
-      <item>DragSource</item>
-      <item>DragSourceAdapter</item>
-      <item>DragSourceContext</item>
-      <item>DragSourceDragEvent</item>
-      <item>DragSourceDropEvent</item>
-      <item>DragSourceEvent</item>
-      <item>DragSourceListener</item>
-      <item>DragSourceMotionListener</item>
-      <item>Driver</item>
-      <item>DriverManager</item>
-      <item>DriverPropertyInfo</item>
-      <item>DropTarget</item>
-      <item>DropTarget.DropTargetAutoScroller</item>
-      <item>DropTargetAdapter</item>
-      <item>DropTargetContext</item>
-      <item>DropTargetDragEvent</item>
-      <item>DropTargetDropEvent</item>
-      <item>DropTargetEvent</item>
-      <item>DropTargetListener</item>
-      <item>DuplicateFormatFlagsException</item>
-      <item>DuplicateName</item>
-      <item>DuplicateNameHelper</item>
-      <item>Duration</item>
-      <item>DynAny</item>
-      <item>DynAny</item>
-      <item>DynAnyFactory</item>
-      <item>DynAnyFactoryHelper</item>
-      <item>DynAnyFactoryOperations</item>
-      <item>DynAnyHelper</item>
-      <item>DynAnyOperations</item>
-      <item>DynAnySeqHelper</item>
-      <item>DynArray</item>
-      <item>DynArray</item>
-      <item>DynArrayHelper</item>
-      <item>DynArrayOperations</item>
-      <item>DynEnum</item>
-      <item>DynEnum</item>
-      <item>DynEnumHelper</item>
-      <item>DynEnumOperations</item>
-      <item>DynFixed</item>
-      <item>DynFixed</item>
-      <item>DynFixedHelper</item>
-      <item>DynFixedOperations</item>
-      <item>DynSequence</item>
-      <item>DynSequence</item>
-      <item>DynSequenceHelper</item>
-      <item>DynSequenceOperations</item>
-      <item>DynStruct</item>
-      <item>DynStruct</item>
-      <item>DynStructHelper</item>
-      <item>DynStructOperations</item>
-      <item>DynUnion</item>
-      <item>DynUnion</item>
-      <item>DynUnionHelper</item>
-      <item>DynUnionOperations</item>
-      <item>DynValue</item>
-      <item>DynValue</item>
-      <item>DynValueBox</item>
-      <item>DynValueBoxOperations</item>
-      <item>DynValueCommon</item>
-      <item>DynValueCommonOperations</item>
-      <item>DynValueHelper</item>
-      <item>DynValueOperations</item>
-      <item>DynamicImplementation</item>
-      <item>DynamicImplementation</item>
-      <item>DynamicMBean</item>
-      <item>ECField</item>
-      <item>ECFieldF2m</item>
-      <item>ECFieldFp</item>
-      <item>ECGenParameterSpec</item>
-      <item>ECKey</item>
-      <item>ECParameterSpec</item>
-      <item>ECPoint</item>
-      <item>ECPrivateKey</item>
-      <item>ECPrivateKeySpec</item>
-      <item>ECPublicKey</item>
-      <item>ECPublicKeySpec</item>
-      <item>ENCODING_CDR_ENCAPS</item>
-      <item>EOFException</item>
-      <item>EditorKit</item>
-      <item>Element</item>
-      <item>Element</item>
-      <item>Element</item>
-      <item>ElementIterator</item>
-      <item>ElementType</item>
-      <item>Ellipse2D</item>
-      <item>Ellipse2D.Double</item>
-      <item>Ellipse2D.Float</item>
-      <item>EllipticCurve</item>
-      <item>EmptyBorder</item>
-      <item>EmptyStackException</item>
-      <item>EncodedKeySpec</item>
-      <item>Encoder</item>
-      <item>Encoding</item>
-      <item>EncryptedPrivateKeyInfo</item>
-      <item>Entity</item>
-      <item>Entity</item>
-      <item>EntityReference</item>
-      <item>EntityResolver</item>
-      <item>EntityResolver2</item>
-      <item>Enum</item>
-      <item>EnumConstantNotPresentException</item>
-      <item>EnumControl</item>
-      <item>EnumControl.Type</item>
-      <item>EnumMap</item>
-      <item>EnumSet</item>
-      <item>EnumSyntax</item>
-      <item>Enumeration</item>
-      <item>Environment</item>
-      <item>Error</item>
-      <item>ErrorHandler</item>
-      <item>ErrorListener</item>
-      <item>ErrorManager</item>
-      <item>EtchedBorder</item>
-      <item>Event</item>
-      <item>EventContext</item>
-      <item>EventDirContext</item>
-      <item>EventHandler</item>
-      <item>EventListener</item>
-      <item>EventListenerList</item>
-      <item>EventListenerProxy</item>
-      <item>EventObject</item>
-      <item>EventQueue</item>
-      <item>EventSetDescriptor</item>
-      <item>Exception</item>
-      <item>ExceptionDetailMessage</item>
-      <item>ExceptionInInitializerError</item>
-      <item>ExceptionList</item>
-      <item>ExceptionListener</item>
-      <item>Exchanger</item>
-      <item>ExecutionException</item>
-      <item>Executor</item>
-      <item>ExecutorCompletionService</item>
-      <item>ExecutorService</item>
-      <item>Executors</item>
-      <item>ExemptionMechanism</item>
-      <item>ExemptionMechanismException</item>
-      <item>ExemptionMechanismSpi</item>
-      <item>ExpandVetoException</item>
-      <item>ExportException</item>
-      <item>Expression</item>
-      <item>ExtendedRequest</item>
-      <item>ExtendedResponse</item>
-      <item>Externalizable</item>
-      <item>FREE_MEM</item>
-      <item>FactoryConfigurationError</item>
-      <item>FailedLoginException</item>
-      <item>FeatureDescriptor</item>
-      <item>Fidelity</item>
-      <item>Field</item>
-      <item>FieldNameHelper</item>
-      <item>FieldNameHelper</item>
-      <item>FieldPosition</item>
-      <item>FieldView</item>
-      <item>File</item>
-      <item>FileCacheImageInputStream</item>
-      <item>FileCacheImageOutputStream</item>
-      <item>FileChannel</item>
-      <item>FileChannel.MapMode</item>
-      <item>FileChooserUI</item>
-      <item>FileDescriptor</item>
-      <item>FileDialog</item>
-      <item>FileFilter</item>
-      <item>FileFilter</item>
-      <item>FileHandler</item>
-      <item>FileImageInputStream</item>
-      <item>FileImageOutputStream</item>
-      <item>FileInputStream</item>
-      <item>FileLock</item>
-      <item>FileLockInterruptionException</item>
-      <item>FileNameMap</item>
-      <item>FileNotFoundException</item>
-      <item>FileOutputStream</item>
-      <item>FilePermission</item>
-      <item>FileReader</item>
-      <item>FileSystemView</item>
-      <item>FileView</item>
-      <item>FileWriter</item>
-      <item>FilenameFilter</item>
-      <item>Filter</item>
-      <item>FilterInputStream</item>
-      <item>FilterOutputStream</item>
-      <item>FilterReader</item>
-      <item>FilterWriter</item>
-      <item>FilteredImageSource</item>
-      <item>FilteredRowSet</item>
-      <item>Finishings</item>
-      <item>FixedHeightLayoutCache</item>
-      <item>FixedHolder</item>
-      <item>FlatteningPathIterator</item>
-      <item>FlavorEvent</item>
-      <item>FlavorException</item>
-      <item>FlavorListener</item>
-      <item>FlavorMap</item>
-      <item>FlavorTable</item>
-      <item>Float</item>
-      <item>FloatBuffer</item>
-      <item>FloatControl</item>
-      <item>FloatControl.Type</item>
-      <item>FloatHolder</item>
-      <item>FloatSeqHelper</item>
-      <item>FloatSeqHolder</item>
-      <item>FlowLayout</item>
-      <item>FlowView</item>
-      <item>FlowView.FlowStrategy</item>
-      <item>Flushable</item>
-      <item>FocusAdapter</item>
-      <item>FocusEvent</item>
-      <item>FocusListener</item>
-      <item>FocusManager</item>
-      <item>FocusTraversalPolicy</item>
-      <item>Font</item>
-      <item>FontFormatException</item>
-      <item>FontMetrics</item>
-      <item>FontRenderContext</item>
-      <item>FontUIResource</item>
-      <item>FormSubmitEvent</item>
-      <item>FormSubmitEvent.MethodType</item>
-      <item>FormView</item>
-      <item>Format</item>
-      <item>Format.Field</item>
-      <item>FormatConversionProvider</item>
-      <item>FormatFlagsConversionMismatchException</item>
-      <item>FormatMismatch</item>
-      <item>FormatMismatchHelper</item>
-      <item>Formattable</item>
-      <item>FormattableFlags</item>
-      <item>Formatter</item>
-      <item>Formatter</item>
-      <item>FormatterClosedException</item>
-      <item>ForwardRequest</item>
-      <item>ForwardRequest</item>
-      <item>ForwardRequestHelper</item>
-      <item>ForwardRequestHelper</item>
-      <item>Frame</item>
-      <item>Future</item>
-      <item>FutureTask</item>
-      <item>GSSContext</item>
-      <item>GSSCredential</item>
-      <item>GSSException</item>
-      <item>GSSManager</item>
-      <item>GSSName</item>
-      <item>GZIPInputStream</item>
-      <item>GZIPOutputStream</item>
-      <item>GapContent</item>
-      <item>GarbageCollectorMXBean</item>
-      <item>GatheringByteChannel</item>
-      <item>GaugeMonitor</item>
-      <item>GaugeMonitorMBean</item>
-      <item>GeneralPath</item>
-      <item>GeneralSecurityException</item>
-      <item>GenericArrayType</item>
-      <item>GenericDeclaration</item>
-      <item>GenericSignatureFormatError</item>
-      <item>GlyphJustificationInfo</item>
-      <item>GlyphMetrics</item>
-      <item>GlyphVector</item>
-      <item>GlyphView</item>
-      <item>GlyphView.GlyphPainter</item>
-      <item>GradientPaint</item>
-      <item>GraphicAttribute</item>
-      <item>Graphics</item>
-      <item>Graphics2D</item>
-      <item>GraphicsConfigTemplate</item>
-      <item>GraphicsConfiguration</item>
-      <item>GraphicsDevice</item>
-      <item>GraphicsEnvironment</item>
-      <item>GrayFilter</item>
-      <item>GregorianCalendar</item>
-      <item>GridBagConstraints</item>
-      <item>GridBagLayout</item>
-      <item>GridLayout</item>
-      <item>Group</item>
-      <item>Guard</item>
-      <item>GuardedObject</item>
-      <item>HOLDING</item>
-      <item>HTML</item>
-      <item>HTML.Attribute</item>
-      <item>HTML.Tag</item>
-      <item>HTML.UnknownTag</item>
-      <item>HTMLDocument</item>
-      <item>HTMLDocument.Iterator</item>
-      <item>HTMLEditorKit</item>
-      <item>HTMLEditorKit.HTMLFactory</item>
-      <item>HTMLEditorKit.HTMLTextAction</item>
-      <item>HTMLEditorKit.InsertHTMLTextAction</item>
-      <item>HTMLEditorKit.LinkController</item>
-      <item>HTMLEditorKit.Parser</item>
-      <item>HTMLEditorKit.ParserCallback</item>
-      <item>HTMLFrameHyperlinkEvent</item>
-      <item>HTMLWriter</item>
-      <item>Handler</item>
-      <item>HandlerBase</item>
-      <item>HandshakeCompletedEvent</item>
-      <item>HandshakeCompletedListener</item>
-      <item>HasControls</item>
-      <item>HashAttributeSet</item>
-      <item>HashDocAttributeSet</item>
-      <item>HashMap</item>
-      <item>HashPrintJobAttributeSet</item>
-      <item>HashPrintRequestAttributeSet</item>
-      <item>HashPrintServiceAttributeSet</item>
-      <item>HashSet</item>
-      <item>Hashtable</item>
-      <item>HeadlessException</item>
-      <item>HierarchyBoundsAdapter</item>
-      <item>HierarchyBoundsListener</item>
-      <item>HierarchyEvent</item>
-      <item>HierarchyListener</item>
-      <item>Highlighter</item>
-      <item>Highlighter.Highlight</item>
-      <item>Highlighter.HighlightPainter</item>
-      <item>HostnameVerifier</item>
-      <item>HttpRetryException</item>
-      <item>HttpURLConnection</item>
-      <item>HttpsURLConnection</item>
-      <item>HyperlinkEvent</item>
-      <item>HyperlinkEvent.EventType</item>
-      <item>HyperlinkListener</item>
-      <item>ICC_ColorSpace</item>
-      <item>ICC_Profile</item>
-      <item>ICC_ProfileGray</item>
-      <item>ICC_ProfileRGB</item>
-      <item>IDLEntity</item>
-      <item>IDLType</item>
-      <item>IDLTypeHelper</item>
-      <item>IDLTypeOperations</item>
-      <item>ID_ASSIGNMENT_POLICY_ID</item>
-      <item>ID_UNIQUENESS_POLICY_ID</item>
-      <item>IIOByteBuffer</item>
-      <item>IIOException</item>
-      <item>IIOImage</item>
-      <item>IIOInvalidTreeException</item>
-      <item>IIOMetadata</item>
-      <item>IIOMetadataController</item>
-      <item>IIOMetadataFormat</item>
-      <item>IIOMetadataFormatImpl</item>
-      <item>IIOMetadataNode</item>
-      <item>IIOParam</item>
-      <item>IIOParamController</item>
-      <item>IIOReadProgressListener</item>
-      <item>IIOReadUpdateListener</item>
-      <item>IIOReadWarningListener</item>
-      <item>IIORegistry</item>
-      <item>IIOServiceProvider</item>
-      <item>IIOWriteProgressListener</item>
-      <item>IIOWriteWarningListener</item>
-      <item>IMPLICIT_ACTIVATION_POLICY_ID</item>
-      <item>IMP_LIMIT</item>
-      <item>INACTIVE</item>
-      <item>INITIALIZE</item>
-      <item>INTERNAL</item>
-      <item>INTF_REPOS</item>
-      <item>INVALID_ACTIVITY</item>
-      <item>INVALID_TRANSACTION</item>
-      <item>INV_FLAG</item>
-      <item>INV_IDENT</item>
-      <item>INV_OBJREF</item>
-      <item>INV_POLICY</item>
-      <item>IOException</item>
-      <item>IOR</item>
-      <item>IORHelper</item>
-      <item>IORHolder</item>
-      <item>IORInfo</item>
-      <item>IORInfoOperations</item>
-      <item>IORInterceptor</item>
-      <item>IORInterceptorOperations</item>
-      <item>IORInterceptor_3_0</item>
-      <item>IORInterceptor_3_0Helper</item>
-      <item>IORInterceptor_3_0Holder</item>
-      <item>IORInterceptor_3_0Operations</item>
-      <item>IRObject</item>
-      <item>IRObjectOperations</item>
-      <item>Icon</item>
-      <item>IconUIResource</item>
-      <item>IconView</item>
-      <item>IdAssignmentPolicy</item>
-      <item>IdAssignmentPolicyOperations</item>
-      <item>IdAssignmentPolicyValue</item>
-      <item>IdUniquenessPolicy</item>
-      <item>IdUniquenessPolicyOperations</item>
-      <item>IdUniquenessPolicyValue</item>
-      <item>IdentifierHelper</item>
-      <item>Identity</item>
-      <item>IdentityHashMap</item>
-      <item>IdentityScope</item>
-      <item>IllegalAccessError</item>
-      <item>IllegalAccessException</item>
-      <item>IllegalArgumentException</item>
-      <item>IllegalBlockSizeException</item>
-      <item>IllegalBlockingModeException</item>
-      <item>IllegalCharsetNameException</item>
-      <item>IllegalClassFormatException</item>
-      <item>IllegalComponentStateException</item>
-      <item>IllegalFormatCodePointException</item>
-      <item>IllegalFormatConversionException</item>
-      <item>IllegalFormatException</item>
-      <item>IllegalFormatFlagsException</item>
-      <item>IllegalFormatPrecisionException</item>
-      <item>IllegalFormatWidthException</item>
-      <item>IllegalMonitorStateException</item>
-      <item>IllegalPathStateException</item>
-      <item>IllegalSelectorException</item>
-      <item>IllegalStateException</item>
-      <item>IllegalThreadStateException</item>
-      <item>Image</item>
-      <item>ImageCapabilities</item>
-      <item>ImageConsumer</item>
-      <item>ImageFilter</item>
-      <item>ImageGraphicAttribute</item>
-      <item>ImageIO</item>
-      <item>ImageIcon</item>
-      <item>ImageInputStream</item>
-      <item>ImageInputStreamImpl</item>
-      <item>ImageInputStreamSpi</item>
-      <item>ImageObserver</item>
-      <item>ImageOutputStream</item>
-      <item>ImageOutputStreamImpl</item>
-      <item>ImageOutputStreamSpi</item>
-      <item>ImageProducer</item>
-      <item>ImageReadParam</item>
-      <item>ImageReader</item>
-      <item>ImageReaderSpi</item>
-      <item>ImageReaderWriterSpi</item>
-      <item>ImageTranscoder</item>
-      <item>ImageTranscoderSpi</item>
-      <item>ImageTypeSpecifier</item>
-      <item>ImageView</item>
-      <item>ImageWriteParam</item>
-      <item>ImageWriter</item>
-      <item>ImageWriterSpi</item>
-      <item>ImagingOpException</item>
-      <item>ImplicitActivationPolicy</item>
-      <item>ImplicitActivationPolicyOperations</item>
-      <item>ImplicitActivationPolicyValue</item>
-      <item>IncompatibleClassChangeError</item>
-      <item>IncompleteAnnotationException</item>
-      <item>InconsistentTypeCode</item>
-      <item>InconsistentTypeCode</item>
-      <item>InconsistentTypeCodeHelper</item>
-      <item>IndexColorModel</item>
-      <item>IndexOutOfBoundsException</item>
-      <item>IndexedPropertyChangeEvent</item>
-      <item>IndexedPropertyDescriptor</item>
-      <item>IndirectionException</item>
-      <item>Inet4Address</item>
-      <item>Inet6Address</item>
-      <item>InetAddress</item>
-      <item>InetSocketAddress</item>
-      <item>Inflater</item>
-      <item>InflaterInputStream</item>
-      <item>InheritableThreadLocal</item>
-      <item>Inherited</item>
-      <item>InitialContext</item>
-      <item>InitialContextFactory</item>
-      <item>InitialContextFactoryBuilder</item>
-      <item>InitialDirContext</item>
-      <item>InitialLdapContext</item>
-      <item>InlineView</item>
-      <item>InputContext</item>
-      <item>InputEvent</item>
-      <item>InputMap</item>
-      <item>InputMapUIResource</item>
-      <item>InputMethod</item>
-      <item>InputMethodContext</item>
-      <item>InputMethodDescriptor</item>
-      <item>InputMethodEvent</item>
-      <item>InputMethodHighlight</item>
-      <item>InputMethodListener</item>
-      <item>InputMethodRequests</item>
-      <item>InputMismatchException</item>
-      <item>InputSource</item>
-      <item>InputStream</item>
-      <item>InputStream</item>
-      <item>InputStream</item>
-      <item>InputStreamReader</item>
-      <item>InputSubset</item>
-      <item>InputVerifier</item>
-      <item>Insets</item>
-      <item>InsetsUIResource</item>
-      <item>InstanceAlreadyExistsException</item>
-      <item>InstanceNotFoundException</item>
-      <item>InstantiationError</item>
-      <item>InstantiationException</item>
-      <item>Instrument</item>
-      <item>Instrumentation</item>
-      <item>InsufficientResourcesException</item>
-      <item>IntBuffer</item>
-      <item>IntHolder</item>
-      <item>Integer</item>
-      <item>IntegerSyntax</item>
-      <item>Interceptor</item>
-      <item>InterceptorOperations</item>
-      <item>InternalError</item>
-      <item>InternalFrameAdapter</item>
-      <item>InternalFrameEvent</item>
-      <item>InternalFrameFocusTraversalPolicy</item>
-      <item>InternalFrameListener</item>
-      <item>InternalFrameUI</item>
-      <item>InternationalFormatter</item>
-      <item>InterruptedException</item>
-      <item>InterruptedIOException</item>
-      <item>InterruptedNamingException</item>
-      <item>InterruptibleChannel</item>
-      <item>IntrospectionException</item>
-      <item>IntrospectionException</item>
-      <item>Introspector</item>
-      <item>Invalid</item>
-      <item>InvalidActivityException</item>
-      <item>InvalidAddress</item>
-      <item>InvalidAddressHelper</item>
-      <item>InvalidAddressHolder</item>
-      <item>InvalidAlgorithmParameterException</item>
-      <item>InvalidApplicationException</item>
-      <item>InvalidAttributeIdentifierException</item>
-      <item>InvalidAttributeValueException</item>
-      <item>InvalidAttributeValueException</item>
-      <item>InvalidAttributesException</item>
-      <item>InvalidClassException</item>
-      <item>InvalidDnDOperationException</item>
-      <item>InvalidKeyException</item>
-      <item>InvalidKeyException</item>
-      <item>InvalidKeySpecException</item>
-      <item>InvalidMarkException</item>
-      <item>InvalidMidiDataException</item>
-      <item>InvalidName</item>
-      <item>InvalidName</item>
-      <item>InvalidName</item>
-      <item>InvalidNameException</item>
-      <item>InvalidNameHelper</item>
-      <item>InvalidNameHelper</item>
-      <item>InvalidNameHolder</item>
-      <item>InvalidObjectException</item>
-      <item>InvalidOpenTypeException</item>
-      <item>InvalidParameterException</item>
-      <item>InvalidParameterSpecException</item>
-      <item>InvalidPolicy</item>
-      <item>InvalidPolicyHelper</item>
-      <item>InvalidPreferencesFormatException</item>
-      <item>InvalidPropertiesFormatException</item>
-      <item>InvalidRelationIdException</item>
-      <item>InvalidRelationServiceException</item>
-      <item>InvalidRelationTypeException</item>
-      <item>InvalidRoleInfoException</item>
-      <item>InvalidRoleValueException</item>
-      <item>InvalidSearchControlsException</item>
-      <item>InvalidSearchFilterException</item>
-      <item>InvalidSeq</item>
-      <item>InvalidSlot</item>
-      <item>InvalidSlotHelper</item>
-      <item>InvalidTargetObjectTypeException</item>
-      <item>InvalidTransactionException</item>
-      <item>InvalidTypeForEncoding</item>
-      <item>InvalidTypeForEncodingHelper</item>
-      <item>InvalidValue</item>
-      <item>InvalidValue</item>
-      <item>InvalidValueHelper</item>
-      <item>InvocationEvent</item>
-      <item>InvocationHandler</item>
-      <item>InvocationTargetException</item>
-      <item>InvokeHandler</item>
-      <item>IstringHelper</item>
-      <item>ItemEvent</item>
-      <item>ItemListener</item>
-      <item>ItemSelectable</item>
-      <item>Iterable</item>
-      <item>Iterator</item>
-      <item>IvParameterSpec</item>
-      <item>JApplet</item>
-      <item>JButton</item>
-      <item>JCheckBox</item>
-      <item>JCheckBoxMenuItem</item>
-      <item>JColorChooser</item>
-      <item>JComboBox</item>
-      <item>JComboBox.KeySelectionManager</item>
-      <item>JComponent</item>
-      <item>JDesktopPane</item>
-      <item>JDialog</item>
-      <item>JEditorPane</item>
-      <item>JFileChooser</item>
-      <item>JFormattedTextField</item>
-      <item>JFormattedTextField.AbstractFormatter</item>
-      <item>JFormattedTextField.AbstractFormatterFactory</item>
-      <item>JFrame</item>
-      <item>JInternalFrame</item>
-      <item>JInternalFrame.JDesktopIcon</item>
-      <item>JLabel</item>
-      <item>JLayeredPane</item>
-      <item>JList</item>
-      <item>JMException</item>
-      <item>JMRuntimeException</item>
-      <item>JMXAuthenticator</item>
-      <item>JMXConnectionNotification</item>
-      <item>JMXConnector</item>
-      <item>JMXConnectorFactory</item>
-      <item>JMXConnectorProvider</item>
-      <item>JMXConnectorServer</item>
-      <item>JMXConnectorServerFactory</item>
-      <item>JMXConnectorServerMBean</item>
-      <item>JMXConnectorServerProvider</item>
-      <item>JMXPrincipal</item>
-      <item>JMXProviderException</item>
-      <item>JMXServerErrorException</item>
-      <item>JMXServiceURL</item>
-      <item>JMenu</item>
-      <item>JMenuBar</item>
-      <item>JMenuItem</item>
-      <item>JOptionPane</item>
-      <item>JPEGHuffmanTable</item>
-      <item>JPEGImageReadParam</item>
-      <item>JPEGImageWriteParam</item>
-      <item>JPEGQTable</item>
-      <item>JPanel</item>
-      <item>JPasswordField</item>
-      <item>JPopupMenu</item>
-      <item>JPopupMenu.Separator</item>
-      <item>JProgressBar</item>
-      <item>JRadioButton</item>
-      <item>JRadioButtonMenuItem</item>
-      <item>JRootPane</item>
-      <item>JScrollBar</item>
-      <item>JScrollPane</item>
-      <item>JSeparator</item>
-      <item>JSlider</item>
-      <item>JSpinner</item>
-      <item>JSpinner.DateEditor</item>
-      <item>JSpinner.DefaultEditor</item>
-      <item>JSpinner.ListEditor</item>
-      <item>JSpinner.NumberEditor</item>
-      <item>JSplitPane</item>
-      <item>JTabbedPane</item>
-      <item>JTable</item>
-      <item>JTable.PrintMode</item>
-      <item>JTableHeader</item>
-      <item>JTextArea</item>
-      <item>JTextComponent</item>
-      <item>JTextComponent.KeyBinding</item>
-      <item>JTextField</item>
-      <item>JTextPane</item>
-      <item>JToggleButton</item>
-      <item>JToggleButton.ToggleButtonModel</item>
-      <item>JToolBar</item>
-      <item>JToolBar.Separator</item>
-      <item>JToolTip</item>
-      <item>JTree</item>
-      <item>JTree.DynamicUtilTreeNode</item>
-      <item>JTree.EmptySelectionModel</item>
-      <item>JViewport</item>
-      <item>JWindow</item>
-      <item>JarEntry</item>
-      <item>JarException</item>
-      <item>JarFile</item>
-      <item>JarInputStream</item>
-      <item>JarOutputStream</item>
-      <item>JarURLConnection</item>
-      <item>JdbcRowSet</item>
-      <item>JobAttributes</item>
-      <item>JobAttributes.DefaultSelectionType</item>
-      <item>JobAttributes.DestinationType</item>
-      <item>JobAttributes.DialogType</item>
-      <item>JobAttributes.MultipleDocumentHandlingType</item>
-      <item>JobAttributes.SidesType</item>
-      <item>JobHoldUntil</item>
-      <item>JobImpressions</item>
-      <item>JobImpressionsCompleted</item>
-      <item>JobImpressionsSupported</item>
-      <item>JobKOctets</item>
-      <item>JobKOctetsProcessed</item>
-      <item>JobKOctetsSupported</item>
-      <item>JobMediaSheets</item>
-      <item>JobMediaSheetsCompleted</item>
-      <item>JobMediaSheetsSupported</item>
-      <item>JobMessageFromOperator</item>
-      <item>JobName</item>
-      <item>JobOriginatingUserName</item>
-      <item>JobPriority</item>
-      <item>JobPrioritySupported</item>
-      <item>JobSheets</item>
-      <item>JobState</item>
-      <item>JobStateReason</item>
-      <item>JobStateReasons</item>
-      <item>JoinRowSet</item>
-      <item>Joinable</item>
-      <item>KerberosKey</item>
-      <item>KerberosPrincipal</item>
-      <item>KerberosTicket</item>
-      <item>Kernel</item>
-      <item>Key</item>
-      <item>KeyAdapter</item>
-      <item>KeyAgreement</item>
-      <item>KeyAgreementSpi</item>
-      <item>KeyAlreadyExistsException</item>
-      <item>KeyEvent</item>
-      <item>KeyEventDispatcher</item>
-      <item>KeyEventPostProcessor</item>
-      <item>KeyException</item>
-      <item>KeyFactory</item>
-      <item>KeyFactorySpi</item>
-      <item>KeyGenerator</item>
-      <item>KeyGeneratorSpi</item>
-      <item>KeyListener</item>
-      <item>KeyManagementException</item>
-      <item>KeyManager</item>
-      <item>KeyManagerFactory</item>
-      <item>KeyManagerFactorySpi</item>
-      <item>KeyPair</item>
-      <item>KeyPairGenerator</item>
-      <item>KeyPairGeneratorSpi</item>
-      <item>KeyRep</item>
-      <item>KeyRep.Type</item>
-      <item>KeySpec</item>
-      <item>KeyStore</item>
-      <item>KeyStore.Builder</item>
-      <item>KeyStore.CallbackHandlerProtection</item>
-      <item>KeyStore.Entry</item>
-      <item>KeyStore.LoadStoreParameter</item>
-      <item>KeyStore.PasswordProtection</item>
-      <item>KeyStore.PrivateKeyEntry</item>
-      <item>KeyStore.ProtectionParameter</item>
-      <item>KeyStore.SecretKeyEntry</item>
-      <item>KeyStore.TrustedCertificateEntry</item>
-      <item>KeyStoreBuilderParameters</item>
-      <item>KeyStoreException</item>
-      <item>KeyStoreSpi</item>
-      <item>KeyStroke</item>
-      <item>KeyboardFocusManager</item>
-      <item>Keymap</item>
-      <item>LDAPCertStoreParameters</item>
-      <item>LIFESPAN_POLICY_ID</item>
-      <item>LOCATION_FORWARD</item>
-      <item>LSException</item>
-      <item>LSInput</item>
-      <item>LSLoadEvent</item>
-      <item>LSOutput</item>
-      <item>LSParser</item>
-      <item>LSParserFilter</item>
-      <item>LSProgressEvent</item>
-      <item>LSResourceResolver</item>
-      <item>LSSerializer</item>
-      <item>LSSerializerFilter</item>
-      <item>Label</item>
-      <item>LabelUI</item>
-      <item>LabelView</item>
-      <item>LanguageCallback</item>
-      <item>LastOwnerException</item>
-      <item>LayeredHighlighter</item>
-      <item>LayeredHighlighter.LayerPainter</item>
-      <item>LayoutFocusTraversalPolicy</item>
-      <item>LayoutManager</item>
-      <item>LayoutManager2</item>
-      <item>LayoutQueue</item>
-      <item>LdapContext</item>
-      <item>LdapName</item>
-      <item>LdapReferralException</item>
-      <item>Lease</item>
-      <item>Level</item>
-      <item>LexicalHandler</item>
-      <item>LifespanPolicy</item>
-      <item>LifespanPolicyOperations</item>
-      <item>LifespanPolicyValue</item>
-      <item>LimitExceededException</item>
-      <item>Line</item>
-      <item>Line.Info</item>
-      <item>Line2D</item>
-      <item>Line2D.Double</item>
-      <item>Line2D.Float</item>
-      <item>LineBorder</item>
-      <item>LineBreakMeasurer</item>
-      <item>LineEvent</item>
-      <item>LineEvent.Type</item>
-      <item>LineListener</item>
-      <item>LineMetrics</item>
-      <item>LineNumberInputStream</item>
-      <item>LineNumberReader</item>
-      <item>LineUnavailableException</item>
-      <item>LinkException</item>
-      <item>LinkLoopException</item>
-      <item>LinkRef</item>
-      <item>LinkageError</item>
-      <item>LinkedBlockingQueue</item>
-      <item>LinkedHashMap</item>
-      <item>LinkedHashSet</item>
-      <item>LinkedList</item>
-      <item>List</item>
-      <item>List</item>
-      <item>ListCellRenderer</item>
-      <item>ListDataEvent</item>
-      <item>ListDataListener</item>
-      <item>ListIterator</item>
-      <item>ListModel</item>
-      <item>ListResourceBundle</item>
-      <item>ListSelectionEvent</item>
-      <item>ListSelectionListener</item>
-      <item>ListSelectionModel</item>
-      <item>ListUI</item>
-      <item>ListView</item>
-      <item>ListenerNotFoundException</item>
-      <item>LoaderHandler</item>
-      <item>LocalObject</item>
-      <item>Locale</item>
-      <item>LocateRegistry</item>
-      <item>Locator</item>
-      <item>Locator2</item>
-      <item>Locator2Impl</item>
-      <item>LocatorImpl</item>
-      <item>Lock</item>
-      <item>LockSupport</item>
-      <item>LogManager</item>
-      <item>LogRecord</item>
-      <item>LogStream</item>
-      <item>Logger</item>
-      <item>LoggingMXBean</item>
-      <item>LoggingPermission</item>
-      <item>LoginContext</item>
-      <item>LoginException</item>
-      <item>LoginModule</item>
-      <item>Long</item>
-      <item>LongBuffer</item>
-      <item>LongHolder</item>
-      <item>LongLongSeqHelper</item>
-      <item>LongLongSeqHolder</item>
-      <item>LongSeqHelper</item>
-      <item>LongSeqHolder</item>
-      <item>LookAndFeel</item>
-      <item>LookupOp</item>
-      <item>LookupTable</item>
-      <item>MARSHAL</item>
-      <item>MBeanAttributeInfo</item>
-      <item>MBeanConstructorInfo</item>
-      <item>MBeanException</item>
-      <item>MBeanFeatureInfo</item>
-      <item>MBeanInfo</item>
-      <item>MBeanNotificationInfo</item>
-      <item>MBeanOperationInfo</item>
-      <item>MBeanParameterInfo</item>
-      <item>MBeanPermission</item>
-      <item>MBeanRegistration</item>
-      <item>MBeanRegistrationException</item>
-      <item>MBeanServer</item>
-      <item>MBeanServerBuilder</item>
-      <item>MBeanServerConnection</item>
-      <item>MBeanServerDelegate</item>
-      <item>MBeanServerDelegateMBean</item>
-      <item>MBeanServerFactory</item>
-      <item>MBeanServerForwarder</item>
-      <item>MBeanServerInvocationHandler</item>
-      <item>MBeanServerNotification</item>
-      <item>MBeanServerNotificationFilter</item>
-      <item>MBeanServerPermission</item>
-      <item>MBeanTrustPermission</item>
-      <item>MGF1ParameterSpec</item>
-      <item>MLet</item>
-      <item>MLetMBean</item>
-      <item>Mac</item>
-      <item>MacSpi</item>
-      <item>MalformedInputException</item>
-      <item>MalformedLinkException</item>
-      <item>MalformedObjectNameException</item>
-      <item>MalformedParameterizedTypeException</item>
-      <item>MalformedURLException</item>
-      <item>ManageReferralControl</item>
-      <item>ManagementFactory</item>
-      <item>ManagementPermission</item>
-      <item>ManagerFactoryParameters</item>
-      <item>Manifest</item>
-      <item>Map</item>
-      <item>Map.Entry</item>
-      <item>MappedByteBuffer</item>
-      <item>MarshalException</item>
-      <item>MarshalledObject</item>
-      <item>MaskFormatter</item>
-      <item>MatchResult</item>
-      <item>Matcher</item>
-      <item>Math</item>
-      <item>MathContext</item>
-      <item>MatteBorder</item>
-      <item>Media</item>
-      <item>MediaName</item>
-      <item>MediaPrintableArea</item>
-      <item>MediaSize</item>
-      <item>MediaSize.Engineering</item>
-      <item>MediaSize.ISO</item>
-      <item>MediaSize.JIS</item>
-      <item>MediaSize.NA</item>
-      <item>MediaSize.Other</item>
-      <item>MediaSizeName</item>
-      <item>MediaTracker</item>
-      <item>MediaTray</item>
-      <item>Member</item>
-      <item>MemoryCacheImageInputStream</item>
-      <item>MemoryCacheImageOutputStream</item>
-      <item>MemoryHandler</item>
-      <item>MemoryImageSource</item>
-      <item>MemoryMXBean</item>
-      <item>MemoryManagerMXBean</item>
-      <item>MemoryNotificationInfo</item>
-      <item>MemoryPoolMXBean</item>
-      <item>MemoryType</item>
-      <item>MemoryUsage</item>
-      <item>Menu</item>
-      <item>MenuBar</item>
-      <item>MenuBarUI</item>
-      <item>MenuComponent</item>
-      <item>MenuContainer</item>
-      <item>MenuDragMouseEvent</item>
-      <item>MenuDragMouseListener</item>
-      <item>MenuElement</item>
-      <item>MenuEvent</item>
-      <item>MenuItem</item>
-      <item>MenuItemUI</item>
-      <item>MenuKeyEvent</item>
-      <item>MenuKeyListener</item>
-      <item>MenuListener</item>
-      <item>MenuSelectionManager</item>
-      <item>MenuShortcut</item>
-      <item>MessageDigest</item>
-      <item>MessageDigestSpi</item>
-      <item>MessageFormat</item>
-      <item>MessageFormat.Field</item>
-      <item>MessageProp</item>
-      <item>MetaEventListener</item>
-      <item>MetaMessage</item>
-      <item>MetalBorders</item>
-      <item>MetalBorders.ButtonBorder</item>
-      <item>MetalBorders.Flush3DBorder</item>
-      <item>MetalBorders.InternalFrameBorder</item>
-      <item>MetalBorders.MenuBarBorder</item>
-      <item>MetalBorders.MenuItemBorder</item>
-      <item>MetalBorders.OptionDialogBorder</item>
-      <item>MetalBorders.PaletteBorder</item>
-      <item>MetalBorders.PopupMenuBorder</item>
-      <item>MetalBorders.RolloverButtonBorder</item>
-      <item>MetalBorders.ScrollPaneBorder</item>
-      <item>MetalBorders.TableHeaderBorder</item>
-      <item>MetalBorders.TextFieldBorder</item>
-      <item>MetalBorders.ToggleButtonBorder</item>
-      <item>MetalBorders.ToolBarBorder</item>
-      <item>MetalButtonUI</item>
-      <item>MetalCheckBoxIcon</item>
-      <item>MetalCheckBoxUI</item>
-      <item>MetalComboBoxButton</item>
-      <item>MetalComboBoxEditor</item>
-      <item>MetalComboBoxEditor.UIResource</item>
-      <item>MetalComboBoxIcon</item>
-      <item>MetalComboBoxUI</item>
-      <item>MetalDesktopIconUI</item>
-      <item>MetalFileChooserUI</item>
-      <item>MetalIconFactory</item>
-      <item>MetalIconFactory.FileIcon16</item>
-      <item>MetalIconFactory.FolderIcon16</item>
-      <item>MetalIconFactory.PaletteCloseIcon</item>
-      <item>MetalIconFactory.TreeControlIcon</item>
-      <item>MetalIconFactory.TreeFolderIcon</item>
-      <item>MetalIconFactory.TreeLeafIcon</item>
-      <item>MetalInternalFrameTitlePane</item>
-      <item>MetalInternalFrameUI</item>
-      <item>MetalLabelUI</item>
-      <item>MetalLookAndFeel</item>
-      <item>MetalMenuBarUI</item>
-      <item>MetalPopupMenuSeparatorUI</item>
-      <item>MetalProgressBarUI</item>
-      <item>MetalRadioButtonUI</item>
-      <item>MetalRootPaneUI</item>
-      <item>MetalScrollBarUI</item>
-      <item>MetalScrollButton</item>
-      <item>MetalScrollPaneUI</item>
-      <item>MetalSeparatorUI</item>
-      <item>MetalSliderUI</item>
-      <item>MetalSplitPaneUI</item>
-      <item>MetalTabbedPaneUI</item>
-      <item>MetalTextFieldUI</item>
-      <item>MetalTheme</item>
-      <item>MetalToggleButtonUI</item>
-      <item>MetalToolBarUI</item>
-      <item>MetalToolTipUI</item>
-      <item>MetalTreeUI</item>
-      <item>Method</item>
-      <item>MethodDescriptor</item>
-      <item>MidiChannel</item>
-      <item>MidiDevice</item>
-      <item>MidiDevice.Info</item>
-      <item>MidiDeviceProvider</item>
-      <item>MidiEvent</item>
-      <item>MidiFileFormat</item>
-      <item>MidiFileReader</item>
-      <item>MidiFileWriter</item>
-      <item>MidiMessage</item>
-      <item>MidiSystem</item>
-      <item>MidiUnavailableException</item>
-      <item>MimeTypeParseException</item>
-      <item>MinimalHTMLWriter</item>
-      <item>MissingFormatArgumentException</item>
-      <item>MissingFormatWidthException</item>
-      <item>MissingResourceException</item>
-      <item>Mixer</item>
-      <item>Mixer.Info</item>
-      <item>MixerProvider</item>
-      <item>ModelMBean</item>
-      <item>ModelMBeanAttributeInfo</item>
-      <item>ModelMBeanConstructorInfo</item>
-      <item>ModelMBeanInfo</item>
-      <item>ModelMBeanInfoSupport</item>
-      <item>ModelMBeanNotificationBroadcaster</item>
-      <item>ModelMBeanNotificationInfo</item>
-      <item>ModelMBeanOperationInfo</item>
-      <item>ModificationItem</item>
-      <item>Modifier</item>
-      <item>Monitor</item>
-      <item>MonitorMBean</item>
-      <item>MonitorNotification</item>
-      <item>MonitorSettingException</item>
-      <item>MouseAdapter</item>
-      <item>MouseDragGestureRecognizer</item>
-      <item>MouseEvent</item>
-      <item>MouseInfo</item>
-      <item>MouseInputAdapter</item>
-      <item>MouseInputListener</item>
-      <item>MouseListener</item>
-      <item>MouseMotionAdapter</item>
-      <item>MouseMotionListener</item>
-      <item>MouseWheelEvent</item>
-      <item>MouseWheelListener</item>
-      <item>MultiButtonUI</item>
-      <item>MultiColorChooserUI</item>
-      <item>MultiComboBoxUI</item>
-      <item>MultiDesktopIconUI</item>
-      <item>MultiDesktopPaneUI</item>
-      <item>MultiDoc</item>
-      <item>MultiDocPrintJob</item>
-      <item>MultiDocPrintService</item>
-      <item>MultiFileChooserUI</item>
-      <item>MultiInternalFrameUI</item>
-      <item>MultiLabelUI</item>
-      <item>MultiListUI</item>
-      <item>MultiLookAndFeel</item>
-      <item>MultiMenuBarUI</item>
-      <item>MultiMenuItemUI</item>
-      <item>MultiOptionPaneUI</item>
-      <item>MultiPanelUI</item>
-      <item>MultiPixelPackedSampleModel</item>
-      <item>MultiPopupMenuUI</item>
-      <item>MultiProgressBarUI</item>
-      <item>MultiRootPaneUI</item>
-      <item>MultiScrollBarUI</item>
-      <item>MultiScrollPaneUI</item>
-      <item>MultiSeparatorUI</item>
-      <item>MultiSliderUI</item>
-      <item>MultiSpinnerUI</item>
-      <item>MultiSplitPaneUI</item>
-      <item>MultiTabbedPaneUI</item>
-      <item>MultiTableHeaderUI</item>
-      <item>MultiTableUI</item>
-      <item>MultiTextUI</item>
-      <item>MultiToolBarUI</item>
-      <item>MultiToolTipUI</item>
-      <item>MultiTreeUI</item>
-      <item>MultiViewportUI</item>
-      <item>MulticastSocket</item>
-      <item>MultipleComponentProfileHelper</item>
-      <item>MultipleComponentProfileHolder</item>
-      <item>MultipleDocumentHandling</item>
-      <item>MultipleMaster</item>
-      <item>MutableAttributeSet</item>
-      <item>MutableComboBoxModel</item>
-      <item>MutableTreeNode</item>
-      <item>NON_EXISTENT</item>
-      <item>NO_IMPLEMENT</item>
-      <item>NO_MEMORY</item>
-      <item>NO_PERMISSION</item>
-      <item>NO_RESOURCES</item>
-      <item>NO_RESPONSE</item>
-      <item>NVList</item>
-      <item>Name</item>
-      <item>NameAlreadyBoundException</item>
-      <item>NameCallback</item>
-      <item>NameClassPair</item>
-      <item>NameComponent</item>
-      <item>NameComponentHelper</item>
-      <item>NameComponentHolder</item>
-      <item>NameDynAnyPair</item>
-      <item>NameDynAnyPairHelper</item>
-      <item>NameDynAnyPairSeqHelper</item>
-      <item>NameHelper</item>
-      <item>NameHolder</item>
-      <item>NameList</item>
-      <item>NameNotFoundException</item>
-      <item>NameParser</item>
-      <item>NameValuePair</item>
-      <item>NameValuePair</item>
-      <item>NameValuePairHelper</item>
-      <item>NameValuePairHelper</item>
-      <item>NameValuePairSeqHelper</item>
-      <item>NamedNodeMap</item>
-      <item>NamedValue</item>
-      <item>NamespaceChangeListener</item>
-      <item>NamespaceContext</item>
-      <item>NamespaceSupport</item>
-      <item>Naming</item>
-      <item>NamingContext</item>
-      <item>NamingContextExt</item>
-      <item>NamingContextExtHelper</item>
-      <item>NamingContextExtHolder</item>
-      <item>NamingContextExtOperations</item>
-      <item>NamingContextExtPOA</item>
-      <item>NamingContextHelper</item>
-      <item>NamingContextHolder</item>
-      <item>NamingContextOperations</item>
-      <item>NamingContextPOA</item>
-      <item>NamingEnumeration</item>
-      <item>NamingEvent</item>
-      <item>NamingException</item>
-      <item>NamingExceptionEvent</item>
-      <item>NamingListener</item>
-      <item>NamingManager</item>
-      <item>NamingSecurityException</item>
-      <item>NavigationFilter</item>
-      <item>NavigationFilter.FilterBypass</item>
-      <item>NegativeArraySizeException</item>
-      <item>NetPermission</item>
-      <item>NetworkInterface</item>
-      <item>NoClassDefFoundError</item>
-      <item>NoConnectionPendingException</item>
-      <item>NoContext</item>
-      <item>NoContextHelper</item>
-      <item>NoInitialContextException</item>
-      <item>NoPermissionException</item>
-      <item>NoRouteToHostException</item>
-      <item>NoServant</item>
-      <item>NoServantHelper</item>
-      <item>NoSuchAlgorithmException</item>
-      <item>NoSuchAttributeException</item>
-      <item>NoSuchElementException</item>
-      <item>NoSuchFieldError</item>
-      <item>NoSuchFieldException</item>
-      <item>NoSuchMethodError</item>
-      <item>NoSuchMethodException</item>
-      <item>NoSuchObjectException</item>
-      <item>NoSuchPaddingException</item>
-      <item>NoSuchProviderException</item>
-      <item>Node</item>
-      <item>NodeChangeEvent</item>
-      <item>NodeChangeListener</item>
-      <item>NodeList</item>
-      <item>NonReadableChannelException</item>
-      <item>NonWritableChannelException</item>
-      <item>NoninvertibleTransformException</item>
-      <item>NotActiveException</item>
-      <item>NotBoundException</item>
-      <item>NotCompliantMBeanException</item>
-      <item>NotContextException</item>
-      <item>NotEmpty</item>
-      <item>NotEmptyHelper</item>
-      <item>NotEmptyHolder</item>
-      <item>NotFound</item>
-      <item>NotFoundHelper</item>
-      <item>NotFoundHolder</item>
-      <item>NotFoundReason</item>
-      <item>NotFoundReasonHelper</item>
-      <item>NotFoundReasonHolder</item>
-      <item>NotOwnerException</item>
-      <item>NotSerializableException</item>
-      <item>NotYetBoundException</item>
-      <item>NotYetConnectedException</item>
-      <item>Notation</item>
-      <item>Notification</item>
-      <item>NotificationBroadcaster</item>
-      <item>NotificationBroadcasterSupport</item>
-      <item>NotificationEmitter</item>
-      <item>NotificationFilter</item>
-      <item>NotificationFilterSupport</item>
-      <item>NotificationListener</item>
-      <item>NotificationResult</item>
-      <item>NullCipher</item>
-      <item>NullPointerException</item>
-      <item>Number</item>
-      <item>NumberFormat</item>
-      <item>NumberFormat.Field</item>
-      <item>NumberFormatException</item>
-      <item>NumberFormatter</item>
-      <item>NumberOfDocuments</item>
-      <item>NumberOfInterveningJobs</item>
-      <item>NumberUp</item>
-      <item>NumberUpSupported</item>
-      <item>NumericShaper</item>
-      <item>OAEPParameterSpec</item>
-      <item>OBJECT_NOT_EXIST</item>
-      <item>OBJ_ADAPTER</item>
-      <item>OMGVMCID</item>
-      <item>ORB</item>
-      <item>ORB</item>
-      <item>ORBIdHelper</item>
-      <item>ORBInitInfo</item>
-      <item>ORBInitInfoOperations</item>
-      <item>ORBInitializer</item>
-      <item>ORBInitializerOperations</item>
-      <item>ObjID</item>
-      <item>Object</item>
-      <item>Object</item>
-      <item>ObjectAlreadyActive</item>
-      <item>ObjectAlreadyActiveHelper</item>
-      <item>ObjectChangeListener</item>
-      <item>ObjectFactory</item>
-      <item>ObjectFactoryBuilder</item>
-      <item>ObjectHelper</item>
-      <item>ObjectHolder</item>
-      <item>ObjectIdHelper</item>
-      <item>ObjectIdHelper</item>
-      <item>ObjectImpl</item>
-      <item>ObjectImpl</item>
-      <item>ObjectInput</item>
-      <item>ObjectInputStream</item>
-      <item>ObjectInputStream.GetField</item>
-      <item>ObjectInputValidation</item>
-      <item>ObjectInstance</item>
-      <item>ObjectName</item>
-      <item>ObjectNotActive</item>
-      <item>ObjectNotActiveHelper</item>
-      <item>ObjectOutput</item>
-      <item>ObjectOutputStream</item>
-      <item>ObjectOutputStream.PutField</item>
-      <item>ObjectReferenceFactory</item>
-      <item>ObjectReferenceFactoryHelper</item>
-      <item>ObjectReferenceFactoryHolder</item>
-      <item>ObjectReferenceTemplate</item>
-      <item>ObjectReferenceTemplateHelper</item>
-      <item>ObjectReferenceTemplateHolder</item>
-      <item>ObjectReferenceTemplateSeqHelper</item>
-      <item>ObjectReferenceTemplateSeqHolder</item>
-      <item>ObjectStreamClass</item>
-      <item>ObjectStreamConstants</item>
-      <item>ObjectStreamException</item>
-      <item>ObjectStreamField</item>
-      <item>ObjectView</item>
-      <item>Observable</item>
-      <item>Observer</item>
-      <item>OceanTheme</item>
-      <item>OctetSeqHelper</item>
-      <item>OctetSeqHolder</item>
-      <item>Oid</item>
-      <item>OpenDataException</item>
-      <item>OpenMBeanAttributeInfo</item>
-      <item>OpenMBeanAttributeInfoSupport</item>
-      <item>OpenMBeanConstructorInfo</item>
-      <item>OpenMBeanConstructorInfoSupport</item>
-      <item>OpenMBeanInfo</item>
-      <item>OpenMBeanInfoSupport</item>
-      <item>OpenMBeanOperationInfo</item>
-      <item>OpenMBeanOperationInfoSupport</item>
-      <item>OpenMBeanParameterInfo</item>
-      <item>OpenMBeanParameterInfoSupport</item>
-      <item>OpenType</item>
-      <item>OpenType</item>
-      <item>OperatingSystemMXBean</item>
-      <item>Operation</item>
-      <item>OperationNotSupportedException</item>
-      <item>OperationsException</item>
-      <item>Option</item>
-      <item>OptionPaneUI</item>
-      <item>OptionalDataException</item>
-      <item>OrientationRequested</item>
-      <item>OutOfMemoryError</item>
-      <item>OutputDeviceAssigned</item>
-      <item>OutputKeys</item>
-      <item>OutputStream</item>
-      <item>OutputStream</item>
-      <item>OutputStream</item>
-      <item>OutputStreamWriter</item>
-      <item>OverlappingFileLockException</item>
-      <item>OverlayLayout</item>
-      <item>Override</item>
-      <item>Owner</item>
-      <item>PBEKey</item>
-      <item>PBEKeySpec</item>
-      <item>PBEParameterSpec</item>
-      <item>PDLOverrideSupported</item>
-      <item>PERSIST_STORE</item>
-      <item>PKCS8EncodedKeySpec</item>
-      <item>PKIXBuilderParameters</item>
-      <item>PKIXCertPathBuilderResult</item>
-      <item>PKIXCertPathChecker</item>
-      <item>PKIXCertPathValidatorResult</item>
-      <item>PKIXParameters</item>
-      <item>POA</item>
-      <item>POAHelper</item>
-      <item>POAManager</item>
-      <item>POAManagerOperations</item>
-      <item>POAOperations</item>
-      <item>PRIVATE_MEMBER</item>
-      <item>PSSParameterSpec</item>
-      <item>PSource</item>
-      <item>PSource.PSpecified</item>
-      <item>PUBLIC_MEMBER</item>
-      <item>Pack200</item>
-      <item>Pack200.Packer</item>
-      <item>Pack200.Unpacker</item>
-      <item>Package</item>
-      <item>PackedColorModel</item>
-      <item>PageAttributes</item>
-      <item>PageAttributes.ColorType</item>
-      <item>PageAttributes.MediaType</item>
-      <item>PageAttributes.OrientationRequestedType</item>
-      <item>PageAttributes.OriginType</item>
-      <item>PageAttributes.PrintQualityType</item>
-      <item>PageFormat</item>
-      <item>PageRanges</item>
-      <item>Pageable</item>
-      <item>PagedResultsControl</item>
-      <item>PagedResultsResponseControl</item>
-      <item>PagesPerMinute</item>
-      <item>PagesPerMinuteColor</item>
-      <item>Paint</item>
-      <item>PaintContext</item>
-      <item>PaintEvent</item>
-      <item>Panel</item>
-      <item>PanelUI</item>
-      <item>Paper</item>
-      <item>ParagraphView</item>
-      <item>ParagraphView</item>
-      <item>Parameter</item>
-      <item>ParameterBlock</item>
-      <item>ParameterDescriptor</item>
-      <item>ParameterMetaData</item>
-      <item>ParameterMode</item>
-      <item>ParameterModeHelper</item>
-      <item>ParameterModeHolder</item>
-      <item>ParameterizedType</item>
-      <item>ParseException</item>
-      <item>ParsePosition</item>
-      <item>Parser</item>
-      <item>Parser</item>
-      <item>ParserAdapter</item>
-      <item>ParserConfigurationException</item>
-      <item>ParserDelegator</item>
-      <item>ParserFactory</item>
-      <item>PartialResultException</item>
-      <item>PasswordAuthentication</item>
-      <item>PasswordCallback</item>
-      <item>PasswordView</item>
-      <item>Patch</item>
-      <item>PathIterator</item>
-      <item>Pattern</item>
-      <item>PatternSyntaxException</item>
-      <item>Permission</item>
-      <item>Permission</item>
-      <item>PermissionCollection</item>
-      <item>Permissions</item>
-      <item>PersistenceDelegate</item>
-      <item>PersistentMBean</item>
-      <item>PhantomReference</item>
-      <item>Pipe</item>
-      <item>Pipe.SinkChannel</item>
-      <item>Pipe.SourceChannel</item>
-      <item>PipedInputStream</item>
-      <item>PipedOutputStream</item>
-      <item>PipedReader</item>
-      <item>PipedWriter</item>
-      <item>PixelGrabber</item>
-      <item>PixelInterleavedSampleModel</item>
-      <item>PlainDocument</item>
-      <item>PlainView</item>
-      <item>Point</item>
-      <item>Point2D</item>
-      <item>Point2D.Double</item>
-      <item>Point2D.Float</item>
-      <item>PointerInfo</item>
-      <item>Policy</item>
-      <item>Policy</item>
-      <item>Policy</item>
-      <item>PolicyError</item>
-      <item>PolicyErrorCodeHelper</item>
-      <item>PolicyErrorHelper</item>
-      <item>PolicyErrorHolder</item>
-      <item>PolicyFactory</item>
-      <item>PolicyFactoryOperations</item>
-      <item>PolicyHelper</item>
-      <item>PolicyHolder</item>
-      <item>PolicyListHelper</item>
-      <item>PolicyListHolder</item>
-      <item>PolicyNode</item>
-      <item>PolicyOperations</item>
-      <item>PolicyQualifierInfo</item>
-      <item>PolicyTypeHelper</item>
-      <item>Polygon</item>
-      <item>PooledConnection</item>
-      <item>Popup</item>
-      <item>PopupFactory</item>
-      <item>PopupMenu</item>
-      <item>PopupMenuEvent</item>
-      <item>PopupMenuListener</item>
-      <item>PopupMenuUI</item>
-      <item>Port</item>
-      <item>Port.Info</item>
-      <item>PortUnreachableException</item>
-      <item>PortableRemoteObject</item>
-      <item>PortableRemoteObjectDelegate</item>
-      <item>Position</item>
-      <item>Position.Bias</item>
-      <item>Predicate</item>
-      <item>PreferenceChangeEvent</item>
-      <item>PreferenceChangeListener</item>
-      <item>Preferences</item>
-      <item>PreferencesFactory</item>
-      <item>PreparedStatement</item>
-      <item>PresentationDirection</item>
-      <item>Principal</item>
-      <item>Principal</item>
-      <item>PrincipalHolder</item>
-      <item>PrintEvent</item>
-      <item>PrintException</item>
-      <item>PrintGraphics</item>
-      <item>PrintJob</item>
-      <item>PrintJobAdapter</item>
-      <item>PrintJobAttribute</item>
-      <item>PrintJobAttributeEvent</item>
-      <item>PrintJobAttributeListener</item>
-      <item>PrintJobAttributeSet</item>
-      <item>PrintJobEvent</item>
-      <item>PrintJobListener</item>
-      <item>PrintQuality</item>
-      <item>PrintRequestAttribute</item>
-      <item>PrintRequestAttributeSet</item>
-      <item>PrintService</item>
-      <item>PrintServiceAttribute</item>
-      <item>PrintServiceAttributeEvent</item>
-      <item>PrintServiceAttributeListener</item>
-      <item>PrintServiceAttributeSet</item>
-      <item>PrintServiceLookup</item>
-      <item>PrintStream</item>
-      <item>PrintWriter</item>
-      <item>Printable</item>
-      <item>PrinterAbortException</item>
-      <item>PrinterException</item>
-      <item>PrinterGraphics</item>
-      <item>PrinterIOException</item>
-      <item>PrinterInfo</item>
-      <item>PrinterIsAcceptingJobs</item>
-      <item>PrinterJob</item>
-      <item>PrinterLocation</item>
-      <item>PrinterMakeAndModel</item>
-      <item>PrinterMessageFromOperator</item>
-      <item>PrinterMoreInfo</item>
-      <item>PrinterMoreInfoManufacturer</item>
-      <item>PrinterName</item>
-      <item>PrinterResolution</item>
-      <item>PrinterState</item>
-      <item>PrinterStateReason</item>
-      <item>PrinterStateReasons</item>
-      <item>PrinterURI</item>
-      <item>PriorityBlockingQueue</item>
-      <item>PriorityQueue</item>
-      <item>PrivateClassLoader</item>
-      <item>PrivateCredentialPermission</item>
-      <item>PrivateKey</item>
-      <item>PrivateMLet</item>
-      <item>PrivilegedAction</item>
-      <item>PrivilegedActionException</item>
-      <item>PrivilegedExceptionAction</item>
-      <item>Process</item>
-      <item>ProcessBuilder</item>
-      <item>ProcessingInstruction</item>
-      <item>ProfileDataException</item>
-      <item>ProfileIdHelper</item>
-      <item>ProgressBarUI</item>
-      <item>ProgressMonitor</item>
-      <item>ProgressMonitorInputStream</item>
-      <item>Properties</item>
-      <item>PropertyChangeEvent</item>
-      <item>PropertyChangeListener</item>
-      <item>PropertyChangeListenerProxy</item>
-      <item>PropertyChangeSupport</item>
-      <item>PropertyDescriptor</item>
-      <item>PropertyEditor</item>
-      <item>PropertyEditorManager</item>
-      <item>PropertyEditorSupport</item>
-      <item>PropertyPermission</item>
-      <item>PropertyResourceBundle</item>
-      <item>PropertyVetoException</item>
-      <item>ProtectionDomain</item>
-      <item>ProtocolException</item>
-      <item>Provider</item>
-      <item>Provider.Service</item>
-      <item>ProviderException</item>
-      <item>Proxy</item>
-      <item>Proxy</item>
-      <item>Proxy.Type</item>
-      <item>ProxySelector</item>
-      <item>PublicKey</item>
-      <item>PushbackInputStream</item>
-      <item>PushbackReader</item>
-      <item>QName</item>
-      <item>QuadCurve2D</item>
-      <item>QuadCurve2D.Double</item>
-      <item>QuadCurve2D.Float</item>
-      <item>Query</item>
-      <item>QueryEval</item>
-      <item>QueryExp</item>
-      <item>Queue</item>
-      <item>QueuedJobCount</item>
-      <item>RC2ParameterSpec</item>
-      <item>RC5ParameterSpec</item>
-      <item>REBIND</item>
-      <item>REQUEST_PROCESSING_POLICY_ID</item>
-      <item>RGBImageFilter</item>
-      <item>RMIClassLoader</item>
-      <item>RMIClassLoaderSpi</item>
-      <item>RMIClientSocketFactory</item>
-      <item>RMIConnection</item>
-      <item>RMIConnectionImpl</item>
-      <item>RMIConnectionImpl_Stub</item>
-      <item>RMIConnector</item>
-      <item>RMIConnectorServer</item>
-      <item>RMICustomMaxStreamFormat</item>
-      <item>RMIFailureHandler</item>
-      <item>RMIIIOPServerImpl</item>
-      <item>RMIJRMPServerImpl</item>
-      <item>RMISecurityException</item>
-      <item>RMISecurityManager</item>
-      <item>RMIServer</item>
-      <item>RMIServerImpl</item>
-      <item>RMIServerImpl_Stub</item>
-      <item>RMIServerSocketFactory</item>
-      <item>RMISocketFactory</item>
-      <item>RSAKey</item>
-      <item>RSAKeyGenParameterSpec</item>
-      <item>RSAMultiPrimePrivateCrtKey</item>
-      <item>RSAMultiPrimePrivateCrtKeySpec</item>
-      <item>RSAOtherPrimeInfo</item>
-      <item>RSAPrivateCrtKey</item>
-      <item>RSAPrivateCrtKeySpec</item>
-      <item>RSAPrivateKey</item>
-      <item>RSAPrivateKeySpec</item>
-      <item>RSAPublicKey</item>
-      <item>RSAPublicKeySpec</item>
-      <item>RTFEditorKit</item>
-      <item>Random</item>
-      <item>RandomAccess</item>
-      <item>RandomAccessFile</item>
-      <item>Raster</item>
-      <item>RasterFormatException</item>
-      <item>RasterOp</item>
-      <item>Rdn</item>
-      <item>ReadOnlyBufferException</item>
-      <item>ReadWriteLock</item>
-      <item>Readable</item>
-      <item>ReadableByteChannel</item>
-      <item>Reader</item>
-      <item>RealmCallback</item>
-      <item>RealmChoiceCallback</item>
-      <item>Receiver</item>
-      <item>Rectangle</item>
-      <item>Rectangle2D</item>
-      <item>Rectangle2D.Double</item>
-      <item>Rectangle2D.Float</item>
-      <item>RectangularShape</item>
-      <item>ReentrantLock</item>
-      <item>ReentrantReadWriteLock</item>
-      <item>ReentrantReadWriteLock.ReadLock</item>
-      <item>ReentrantReadWriteLock.WriteLock</item>
-      <item>Ref</item>
-      <item>RefAddr</item>
-      <item>Reference</item>
-      <item>Reference</item>
-      <item>ReferenceQueue</item>
-      <item>ReferenceUriSchemesSupported</item>
-      <item>Referenceable</item>
-      <item>ReferralException</item>
-      <item>ReflectPermission</item>
-      <item>ReflectionException</item>
-      <item>RefreshFailedException</item>
-      <item>Refreshable</item>
-      <item>Region</item>
-      <item>RegisterableService</item>
-      <item>Registry</item>
-      <item>RegistryHandler</item>
-      <item>RejectedExecutionException</item>
-      <item>RejectedExecutionHandler</item>
-      <item>Relation</item>
-      <item>RelationException</item>
-      <item>RelationNotFoundException</item>
-      <item>RelationNotification</item>
-      <item>RelationService</item>
-      <item>RelationServiceMBean</item>
-      <item>RelationServiceNotRegisteredException</item>
-      <item>RelationSupport</item>
-      <item>RelationSupportMBean</item>
-      <item>RelationType</item>
-      <item>RelationTypeNotFoundException</item>
-      <item>RelationTypeSupport</item>
-      <item>RemarshalException</item>
-      <item>Remote</item>
-      <item>RemoteCall</item>
-      <item>RemoteException</item>
-      <item>RemoteObject</item>
-      <item>RemoteObjectInvocationHandler</item>
-      <item>RemoteRef</item>
-      <item>RemoteServer</item>
-      <item>RemoteStub</item>
-      <item>RenderContext</item>
-      <item>RenderableImage</item>
-      <item>RenderableImageOp</item>
-      <item>RenderableImageProducer</item>
-      <item>RenderedImage</item>
-      <item>RenderedImageFactory</item>
-      <item>Renderer</item>
-      <item>RenderingHints</item>
-      <item>RenderingHints.Key</item>
-      <item>RepaintManager</item>
-      <item>ReplicateScaleFilter</item>
-      <item>RepositoryIdHelper</item>
-      <item>Request</item>
-      <item>RequestInfo</item>
-      <item>RequestInfoOperations</item>
-      <item>RequestProcessingPolicy</item>
-      <item>RequestProcessingPolicyOperations</item>
-      <item>RequestProcessingPolicyValue</item>
-      <item>RequestingUserName</item>
-      <item>RequiredModelMBean</item>
-      <item>RescaleOp</item>
-      <item>ResolutionSyntax</item>
-      <item>ResolveResult</item>
-      <item>Resolver</item>
-      <item>ResourceBundle</item>
-      <item>ResponseCache</item>
-      <item>ResponseHandler</item>
-      <item>Result</item>
-      <item>ResultSet</item>
-      <item>ResultSetMetaData</item>
-      <item>Retention</item>
-      <item>RetentionPolicy</item>
-      <item>ReverbType</item>
-      <item>Robot</item>
-      <item>Role</item>
-      <item>RoleInfo</item>
-      <item>RoleInfoNotFoundException</item>
-      <item>RoleList</item>
-      <item>RoleNotFoundException</item>
-      <item>RoleResult</item>
-      <item>RoleStatus</item>
-      <item>RoleUnresolved</item>
-      <item>RoleUnresolvedList</item>
-      <item>RootPaneContainer</item>
-      <item>RootPaneUI</item>
-      <item>RoundRectangle2D</item>
-      <item>RoundRectangle2D.Double</item>
-      <item>RoundRectangle2D.Float</item>
-      <item>RoundingMode</item>
-      <item>RowMapper</item>
-      <item>RowSet</item>
-      <item>RowSetEvent</item>
-      <item>RowSetInternal</item>
-      <item>RowSetListener</item>
-      <item>RowSetMetaData</item>
-      <item>RowSetMetaDataImpl</item>
-      <item>RowSetReader</item>
-      <item>RowSetWarning</item>
-      <item>RowSetWriter</item>
-      <item>RuleBasedCollator</item>
-      <item>RunTime</item>
-      <item>RunTimeOperations</item>
-      <item>Runnable</item>
-      <item>Runtime</item>
-      <item>RuntimeErrorException</item>
-      <item>RuntimeException</item>
-      <item>RuntimeMBeanException</item>
-      <item>RuntimeMXBean</item>
-      <item>RuntimeOperationsException</item>
-      <item>RuntimePermission</item>
-      <item>SAXException</item>
-      <item>SAXNotRecognizedException</item>
-      <item>SAXNotSupportedException</item>
-      <item>SAXParseException</item>
-      <item>SAXParser</item>
-      <item>SAXParserFactory</item>
-      <item>SAXResult</item>
-      <item>SAXSource</item>
-      <item>SAXTransformerFactory</item>
-      <item>SERVANT_RETENTION_POLICY_ID</item>
-      <item>SQLData</item>
-      <item>SQLException</item>
-      <item>SQLInput</item>
-      <item>SQLInputImpl</item>
-      <item>SQLOutput</item>
-      <item>SQLOutputImpl</item>
-      <item>SQLPermission</item>
-      <item>SQLWarning</item>
-      <item>SSLContext</item>
-      <item>SSLContextSpi</item>
-      <item>SSLEngine</item>
-      <item>SSLEngineResult</item>
-      <item>SSLEngineResult.HandshakeStatus</item>
-      <item>SSLEngineResult.Status</item>
-      <item>SSLException</item>
-      <item>SSLHandshakeException</item>
-      <item>SSLKeyException</item>
-      <item>SSLPeerUnverifiedException</item>
-      <item>SSLPermission</item>
-      <item>SSLProtocolException</item>
-      <item>SSLServerSocket</item>
-      <item>SSLServerSocketFactory</item>
-      <item>SSLSession</item>
-      <item>SSLSessionBindingEvent</item>
-      <item>SSLSessionBindingListener</item>
-      <item>SSLSessionContext</item>
-      <item>SSLSocket</item>
-      <item>SSLSocketFactory</item>
-      <item>SUCCESSFUL</item>
-      <item>SYNC_WITH_TRANSPORT</item>
-      <item>SYSTEM_EXCEPTION</item>
-      <item>SampleModel</item>
-      <item>Sasl</item>
-      <item>SaslClient</item>
-      <item>SaslClientFactory</item>
-      <item>SaslException</item>
-      <item>SaslServer</item>
-      <item>SaslServerFactory</item>
-      <item>Savepoint</item>
-      <item>Scanner</item>
-      <item>ScatteringByteChannel</item>
-      <item>ScheduledExecutorService</item>
-      <item>ScheduledFuture</item>
-      <item>ScheduledThreadPoolExecutor</item>
-      <item>Schema</item>
-      <item>SchemaFactory</item>
-      <item>SchemaFactoryLoader</item>
-      <item>SchemaViolationException</item>
-      <item>ScrollBarUI</item>
-      <item>ScrollPane</item>
-      <item>ScrollPaneAdjustable</item>
-      <item>ScrollPaneConstants</item>
-      <item>ScrollPaneLayout</item>
-      <item>ScrollPaneLayout.UIResource</item>
-      <item>ScrollPaneUI</item>
-      <item>Scrollable</item>
-      <item>Scrollbar</item>
-      <item>SealedObject</item>
-      <item>SearchControls</item>
-      <item>SearchResult</item>
-      <item>SecretKey</item>
-      <item>SecretKeyFactory</item>
-      <item>SecretKeyFactorySpi</item>
-      <item>SecretKeySpec</item>
-      <item>SecureCacheResponse</item>
-      <item>SecureClassLoader</item>
-      <item>SecureRandom</item>
-      <item>SecureRandomSpi</item>
-      <item>Security</item>
-      <item>SecurityException</item>
-      <item>SecurityManager</item>
-      <item>SecurityPermission</item>
-      <item>Segment</item>
-      <item>SelectableChannel</item>
-      <item>SelectionKey</item>
-      <item>Selector</item>
-      <item>SelectorProvider</item>
-      <item>Semaphore</item>
-      <item>SeparatorUI</item>
-      <item>Sequence</item>
-      <item>SequenceInputStream</item>
-      <item>Sequencer</item>
-      <item>Sequencer.SyncMode</item>
-      <item>SerialArray</item>
-      <item>SerialBlob</item>
-      <item>SerialClob</item>
-      <item>SerialDatalink</item>
-      <item>SerialException</item>
-      <item>SerialJavaObject</item>
-      <item>SerialRef</item>
-      <item>SerialStruct</item>
-      <item>Serializable</item>
-      <item>SerializablePermission</item>
-      <item>Servant</item>
-      <item>ServantActivator</item>
-      <item>ServantActivatorHelper</item>
-      <item>ServantActivatorOperations</item>
-      <item>ServantActivatorPOA</item>
-      <item>ServantAlreadyActive</item>
-      <item>ServantAlreadyActiveHelper</item>
-      <item>ServantLocator</item>
-      <item>ServantLocatorHelper</item>
-      <item>ServantLocatorOperations</item>
-      <item>ServantLocatorPOA</item>
-      <item>ServantManager</item>
-      <item>ServantManagerOperations</item>
-      <item>ServantNotActive</item>
-      <item>ServantNotActiveHelper</item>
-      <item>ServantObject</item>
-      <item>ServantRetentionPolicy</item>
-      <item>ServantRetentionPolicyOperations</item>
-      <item>ServantRetentionPolicyValue</item>
-      <item>ServerCloneException</item>
-      <item>ServerError</item>
-      <item>ServerException</item>
-      <item>ServerIdHelper</item>
-      <item>ServerNotActiveException</item>
-      <item>ServerRef</item>
-      <item>ServerRequest</item>
-      <item>ServerRequestInfo</item>
-      <item>ServerRequestInfoOperations</item>
-      <item>ServerRequestInterceptor</item>
-      <item>ServerRequestInterceptorOperations</item>
-      <item>ServerRuntimeException</item>
-      <item>ServerSocket</item>
-      <item>ServerSocketChannel</item>
-      <item>ServerSocketFactory</item>
-      <item>ServiceContext</item>
-      <item>ServiceContextHelper</item>
-      <item>ServiceContextHolder</item>
-      <item>ServiceContextListHelper</item>
-      <item>ServiceContextListHolder</item>
-      <item>ServiceDetail</item>
-      <item>ServiceDetailHelper</item>
-      <item>ServiceIdHelper</item>
-      <item>ServiceInformation</item>
-      <item>ServiceInformationHelper</item>
-      <item>ServiceInformationHolder</item>
-      <item>ServiceNotFoundException</item>
-      <item>ServicePermission</item>
-      <item>ServiceRegistry</item>
-      <item>ServiceRegistry.Filter</item>
-      <item>ServiceUI</item>
-      <item>ServiceUIFactory</item>
-      <item>ServiceUnavailableException</item>
-      <item>Set</item>
-      <item>SetOfIntegerSyntax</item>
-      <item>SetOverrideType</item>
-      <item>SetOverrideTypeHelper</item>
-      <item>Severity</item>
-      <item>Shape</item>
-      <item>ShapeGraphicAttribute</item>
-      <item>SheetCollate</item>
-      <item>Short</item>
-      <item>ShortBuffer</item>
-      <item>ShortBufferException</item>
-      <item>ShortHolder</item>
-      <item>ShortLookupTable</item>
-      <item>ShortMessage</item>
-      <item>ShortSeqHelper</item>
-      <item>ShortSeqHolder</item>
-      <item>Sides</item>
-      <item>Signature</item>
-      <item>SignatureException</item>
-      <item>SignatureSpi</item>
-      <item>SignedObject</item>
-      <item>Signer</item>
-      <item>SimpleAttributeSet</item>
-      <item>SimpleBeanInfo</item>
-      <item>SimpleDateFormat</item>
-      <item>SimpleDoc</item>
-      <item>SimpleFormatter</item>
-      <item>SimpleTimeZone</item>
-      <item>SimpleType</item>
-      <item>SinglePixelPackedSampleModel</item>
-      <item>SingleSelectionModel</item>
-      <item>Size2DSyntax</item>
-      <item>SizeLimitExceededException</item>
-      <item>SizeRequirements</item>
-      <item>SizeSequence</item>
-      <item>Skeleton</item>
-      <item>SkeletonMismatchException</item>
-      <item>SkeletonNotFoundException</item>
-      <item>SliderUI</item>
-      <item>Socket</item>
-      <item>SocketAddress</item>
-      <item>SocketChannel</item>
-      <item>SocketException</item>
-      <item>SocketFactory</item>
-      <item>SocketHandler</item>
-      <item>SocketImpl</item>
-      <item>SocketImplFactory</item>
-      <item>SocketOptions</item>
-      <item>SocketPermission</item>
-      <item>SocketSecurityException</item>
-      <item>SocketTimeoutException</item>
-      <item>SoftBevelBorder</item>
-      <item>SoftReference</item>
-      <item>SortControl</item>
-      <item>SortKey</item>
-      <item>SortResponseControl</item>
-      <item>SortedMap</item>
-      <item>SortedSet</item>
-      <item>SortingFocusTraversalPolicy</item>
-      <item>Soundbank</item>
-      <item>SoundbankReader</item>
-      <item>SoundbankResource</item>
-      <item>Source</item>
-      <item>SourceDataLine</item>
-      <item>SourceLocator</item>
-      <item>SpinnerDateModel</item>
-      <item>SpinnerListModel</item>
-      <item>SpinnerModel</item>
-      <item>SpinnerNumberModel</item>
-      <item>SpinnerUI</item>
-      <item>SplitPaneUI</item>
-      <item>Spring</item>
-      <item>SpringLayout</item>
-      <item>SpringLayout.Constraints</item>
-      <item>SslRMIClientSocketFactory</item>
-      <item>SslRMIServerSocketFactory</item>
-      <item>Stack</item>
-      <item>StackOverflowError</item>
-      <item>StackTraceElement</item>
-      <item>StandardMBean</item>
-      <item>StartTlsRequest</item>
-      <item>StartTlsResponse</item>
-      <item>State</item>
-      <item>StateEdit</item>
-      <item>StateEditable</item>
-      <item>StateFactory</item>
-      <item>Statement</item>
-      <item>Statement</item>
-      <item>StreamCorruptedException</item>
-      <item>StreamHandler</item>
-      <item>StreamPrintService</item>
-      <item>StreamPrintServiceFactory</item>
-      <item>StreamResult</item>
-      <item>StreamSource</item>
-      <item>StreamTokenizer</item>
-      <item>Streamable</item>
-      <item>StreamableValue</item>
-      <item>StrictMath</item>
-      <item>String</item>
-      <item>StringBuffer</item>
-      <item>StringBufferInputStream</item>
-      <item>StringBuilder</item>
-      <item>StringCharacterIterator</item>
-      <item>StringContent</item>
-      <item>StringHolder</item>
-      <item>StringIndexOutOfBoundsException</item>
-      <item>StringMonitor</item>
-      <item>StringMonitorMBean</item>
-      <item>StringNameHelper</item>
-      <item>StringReader</item>
-      <item>StringRefAddr</item>
-      <item>StringSelection</item>
-      <item>StringSeqHelper</item>
-      <item>StringSeqHolder</item>
-      <item>StringTokenizer</item>
-      <item>StringValueExp</item>
-      <item>StringValueHelper</item>
-      <item>StringWriter</item>
-      <item>Stroke</item>
-      <item>Struct</item>
-      <item>StructMember</item>
-      <item>StructMemberHelper</item>
-      <item>Stub</item>
-      <item>StubDelegate</item>
-      <item>StubNotFoundException</item>
-      <item>Style</item>
-      <item>StyleConstants</item>
-      <item>StyleConstants.CharacterConstants</item>
-      <item>StyleConstants.ColorConstants</item>
-      <item>StyleConstants.FontConstants</item>
-      <item>StyleConstants.ParagraphConstants</item>
-      <item>StyleContext</item>
-      <item>StyleSheet</item>
-      <item>StyleSheet.BoxPainter</item>
-      <item>StyleSheet.ListPainter</item>
-      <item>StyledDocument</item>
-      <item>StyledEditorKit</item>
-      <item>StyledEditorKit.AlignmentAction</item>
-      <item>StyledEditorKit.BoldAction</item>
-      <item>StyledEditorKit.FontFamilyAction</item>
-      <item>StyledEditorKit.FontSizeAction</item>
-      <item>StyledEditorKit.ForegroundAction</item>
-      <item>StyledEditorKit.ItalicAction</item>
-      <item>StyledEditorKit.StyledTextAction</item>
-      <item>StyledEditorKit.UnderlineAction</item>
-      <item>Subject</item>
-      <item>SubjectDelegationPermission</item>
-      <item>SubjectDomainCombiner</item>
-      <item>SupportedValuesAttribute</item>
-      <item>SuppressWarnings</item>
-      <item>SwingConstants</item>
-      <item>SwingPropertyChangeSupport</item>
-      <item>SwingUtilities</item>
-      <item>SyncFactory</item>
-      <item>SyncFactoryException</item>
-      <item>SyncFailedException</item>
-      <item>SyncProvider</item>
-      <item>SyncProviderException</item>
-      <item>SyncResolver</item>
-      <item>SyncScopeHelper</item>
-      <item>SynchronousQueue</item>
-      <item>SynthConstants</item>
-      <item>SynthContext</item>
-      <item>SynthGraphicsUtils</item>
-      <item>SynthLookAndFeel</item>
-      <item>SynthPainter</item>
-      <item>SynthStyle</item>
-      <item>SynthStyleFactory</item>
-      <item>Synthesizer</item>
-      <item>SysexMessage</item>
-      <item>System</item>
-      <item>SystemColor</item>
-      <item>SystemException</item>
-      <item>SystemFlavorMap</item>
-      <item>TAG_ALTERNATE_IIOP_ADDRESS</item>
-      <item>TAG_CODE_SETS</item>
-      <item>TAG_INTERNET_IOP</item>
-      <item>TAG_JAVA_CODEBASE</item>
-      <item>TAG_MULTIPLE_COMPONENTS</item>
-      <item>TAG_ORB_TYPE</item>
-      <item>TAG_POLICIES</item>
-      <item>TAG_RMI_CUSTOM_MAX_STREAM_FORMAT</item>
-      <item>TCKind</item>
-      <item>THREAD_POLICY_ID</item>
-      <item>TIMEOUT</item>
-      <item>TRANSACTION_MODE</item>
-      <item>TRANSACTION_REQUIRED</item>
-      <item>TRANSACTION_ROLLEDBACK</item>
-      <item>TRANSACTION_UNAVAILABLE</item>
-      <item>TRANSIENT</item>
-      <item>TRANSPORT_RETRY</item>
-      <item>TabExpander</item>
-      <item>TabSet</item>
-      <item>TabStop</item>
-      <item>TabableView</item>
-      <item>TabbedPaneUI</item>
-      <item>TableCellEditor</item>
-      <item>TableCellRenderer</item>
-      <item>TableColumn</item>
-      <item>TableColumnModel</item>
-      <item>TableColumnModelEvent</item>
-      <item>TableColumnModelListener</item>
-      <item>TableHeaderUI</item>
-      <item>TableModel</item>
-      <item>TableModelEvent</item>
-      <item>TableModelListener</item>
-      <item>TableUI</item>
-      <item>TableView</item>
-      <item>TabularData</item>
-      <item>TabularDataSupport</item>
-      <item>TabularType</item>
-      <item>TagElement</item>
-      <item>TaggedComponent</item>
-      <item>TaggedComponentHelper</item>
-      <item>TaggedComponentHolder</item>
-      <item>TaggedProfile</item>
-      <item>TaggedProfileHelper</item>
-      <item>TaggedProfileHolder</item>
-      <item>Target</item>
-      <item>TargetDataLine</item>
-      <item>TargetedNotification</item>
-      <item>Templates</item>
-      <item>TemplatesHandler</item>
-      <item>Text</item>
-      <item>TextAction</item>
-      <item>TextArea</item>
-      <item>TextAttribute</item>
-      <item>TextComponent</item>
-      <item>TextEvent</item>
-      <item>TextField</item>
-      <item>TextHitInfo</item>
-      <item>TextInputCallback</item>
-      <item>TextLayout</item>
-      <item>TextLayout.CaretPolicy</item>
-      <item>TextListener</item>
-      <item>TextMeasurer</item>
-      <item>TextOutputCallback</item>
-      <item>TextSyntax</item>
-      <item>TextUI</item>
-      <item>TexturePaint</item>
-      <item>Thread</item>
-      <item>Thread.State</item>
-      <item>Thread.UncaughtExceptionHandler</item>
-      <item>ThreadDeath</item>
-      <item>ThreadFactory</item>
-      <item>ThreadGroup</item>
-      <item>ThreadInfo</item>
-      <item>ThreadLocal</item>
-      <item>ThreadMXBean</item>
-      <item>ThreadPolicy</item>
-      <item>ThreadPolicyOperations</item>
-      <item>ThreadPolicyValue</item>
-      <item>ThreadPoolExecutor</item>
-      <item>ThreadPoolExecutor.AbortPolicy</item>
-      <item>ThreadPoolExecutor.CallerRunsPolicy</item>
-      <item>ThreadPoolExecutor.DiscardOldestPolicy</item>
-      <item>ThreadPoolExecutor.DiscardPolicy</item>
-      <item>Throwable</item>
-      <item>Tie</item>
-      <item>TileObserver</item>
-      <item>Time</item>
-      <item>TimeLimitExceededException</item>
-      <item>TimeUnit</item>
-      <item>TimeZone</item>
-      <item>TimeoutException</item>
-      <item>Timer</item>
-      <item>Timer</item>
-      <item>Timer</item>
-      <item>TimerAlarmClockNotification</item>
-      <item>TimerMBean</item>
-      <item>TimerNotification</item>
-      <item>TimerTask</item>
-      <item>Timestamp</item>
-      <item>Timestamp</item>
-      <item>TitledBorder</item>
-      <item>TooManyListenersException</item>
-      <item>ToolBarUI</item>
-      <item>ToolTipManager</item>
-      <item>ToolTipUI</item>
-      <item>Toolkit</item>
-      <item>Track</item>
-      <item>TransactionRequiredException</item>
-      <item>TransactionRolledbackException</item>
-      <item>TransactionService</item>
-      <item>TransactionalWriter</item>
-      <item>TransferHandler</item>
-      <item>Transferable</item>
-      <item>TransformAttribute</item>
-      <item>Transformer</item>
-      <item>TransformerConfigurationException</item>
-      <item>TransformerException</item>
-      <item>TransformerFactory</item>
-      <item>TransformerFactoryConfigurationError</item>
-      <item>TransformerHandler</item>
-      <item>Transmitter</item>
-      <item>Transparency</item>
-      <item>TreeCellEditor</item>
-      <item>TreeCellRenderer</item>
-      <item>TreeExpansionEvent</item>
-      <item>TreeExpansionListener</item>
-      <item>TreeMap</item>
-      <item>TreeModel</item>
-      <item>TreeModelEvent</item>
-      <item>TreeModelListener</item>
-      <item>TreeNode</item>
-      <item>TreePath</item>
-      <item>TreeSelectionEvent</item>
-      <item>TreeSelectionListener</item>
-      <item>TreeSelectionModel</item>
-      <item>TreeSet</item>
-      <item>TreeUI</item>
-      <item>TreeWillExpandListener</item>
-      <item>TrustAnchor</item>
-      <item>TrustManager</item>
-      <item>TrustManagerFactory</item>
-      <item>TrustManagerFactorySpi</item>
-      <item>Type</item>
-      <item>TypeCode</item>
-      <item>TypeCodeHolder</item>
-      <item>TypeInfo</item>
-      <item>TypeInfoProvider</item>
-      <item>TypeMismatch</item>
-      <item>TypeMismatch</item>
-      <item>TypeMismatch</item>
-      <item>TypeMismatchHelper</item>
-      <item>TypeMismatchHelper</item>
-      <item>TypeNotPresentException</item>
-      <item>TypeVariable</item>
-      <item>Types</item>
-      <item>UID</item>
-      <item>UIDefaults</item>
-      <item>UIDefaults.ActiveValue</item>
-      <item>UIDefaults.LazyInputMap</item>
-      <item>UIDefaults.LazyValue</item>
-      <item>UIDefaults.ProxyLazyValue</item>
-      <item>UIManager</item>
-      <item>UIManager.LookAndFeelInfo</item>
-      <item>UIResource</item>
-      <item>ULongLongSeqHelper</item>
-      <item>ULongLongSeqHolder</item>
-      <item>ULongSeqHelper</item>
-      <item>ULongSeqHolder</item>
-      <item>UNKNOWN</item>
-      <item>UNKNOWN</item>
-      <item>UNSUPPORTED_POLICY</item>
-      <item>UNSUPPORTED_POLICY_VALUE</item>
-      <item>URI</item>
-      <item>URIException</item>
-      <item>URIResolver</item>
-      <item>URISyntax</item>
-      <item>URISyntaxException</item>
-      <item>URL</item>
-      <item>URLClassLoader</item>
-      <item>URLConnection</item>
-      <item>URLDecoder</item>
-      <item>URLEncoder</item>
-      <item>URLStreamHandler</item>
-      <item>URLStreamHandlerFactory</item>
-      <item>URLStringHelper</item>
-      <item>USER_EXCEPTION</item>
-      <item>UShortSeqHelper</item>
-      <item>UShortSeqHolder</item>
-      <item>UTFDataFormatException</item>
-      <item>UUID</item>
-      <item>UndeclaredThrowableException</item>
-      <item>UndoManager</item>
-      <item>UndoableEdit</item>
-      <item>UndoableEditEvent</item>
-      <item>UndoableEditListener</item>
-      <item>UndoableEditSupport</item>
-      <item>UnexpectedException</item>
-      <item>UnicastRemoteObject</item>
-      <item>UnionMember</item>
-      <item>UnionMemberHelper</item>
-      <item>UnknownEncoding</item>
-      <item>UnknownEncodingHelper</item>
-      <item>UnknownError</item>
-      <item>UnknownException</item>
-      <item>UnknownFormatConversionException</item>
-      <item>UnknownFormatFlagsException</item>
-      <item>UnknownGroupException</item>
-      <item>UnknownHostException</item>
-      <item>UnknownHostException</item>
-      <item>UnknownObjectException</item>
-      <item>UnknownServiceException</item>
-      <item>UnknownUserException</item>
-      <item>UnknownUserExceptionHelper</item>
-      <item>UnknownUserExceptionHolder</item>
-      <item>UnmappableCharacterException</item>
-      <item>UnmarshalException</item>
-      <item>UnmodifiableClassException</item>
-      <item>UnmodifiableSetException</item>
-      <item>UnrecoverableEntryException</item>
-      <item>UnrecoverableKeyException</item>
-      <item>Unreferenced</item>
-      <item>UnresolvedAddressException</item>
-      <item>UnresolvedPermission</item>
-      <item>UnsatisfiedLinkError</item>
-      <item>UnsolicitedNotification</item>
-      <item>UnsolicitedNotificationEvent</item>
-      <item>UnsolicitedNotificationListener</item>
-      <item>UnsupportedAddressTypeException</item>
-      <item>UnsupportedAudioFileException</item>
-      <item>UnsupportedCallbackException</item>
-      <item>UnsupportedCharsetException</item>
-      <item>UnsupportedClassVersionError</item>
-      <item>UnsupportedEncodingException</item>
-      <item>UnsupportedFlavorException</item>
-      <item>UnsupportedLookAndFeelException</item>
-      <item>UnsupportedOperationException</item>
-      <item>UserDataHandler</item>
-      <item>UserException</item>
-      <item>Util</item>
-      <item>UtilDelegate</item>
-      <item>Utilities</item>
-      <item>VMID</item>
-      <item>VM_ABSTRACT</item>
-      <item>VM_CUSTOM</item>
-      <item>VM_NONE</item>
-      <item>VM_TRUNCATABLE</item>
-      <item>Validator</item>
-      <item>ValidatorHandler</item>
-      <item>ValueBase</item>
-      <item>ValueBaseHelper</item>
-      <item>ValueBaseHolder</item>
-      <item>ValueExp</item>
-      <item>ValueFactory</item>
-      <item>ValueHandler</item>
-      <item>ValueHandlerMultiFormat</item>
-      <item>ValueInputStream</item>
-      <item>ValueMember</item>
-      <item>ValueMemberHelper</item>
-      <item>ValueOutputStream</item>
-      <item>VariableHeightLayoutCache</item>
-      <item>Vector</item>
-      <item>VerifyError</item>
-      <item>VersionSpecHelper</item>
-      <item>VetoableChangeListener</item>
-      <item>VetoableChangeListenerProxy</item>
-      <item>VetoableChangeSupport</item>
-      <item>View</item>
-      <item>ViewFactory</item>
-      <item>ViewportLayout</item>
-      <item>ViewportUI</item>
-      <item>VirtualMachineError</item>
-      <item>Visibility</item>
-      <item>VisibilityHelper</item>
-      <item>VoiceStatus</item>
-      <item>Void</item>
-      <item>VolatileImage</item>
-      <item>WCharSeqHelper</item>
-      <item>WCharSeqHolder</item>
-      <item>WStringSeqHelper</item>
-      <item>WStringSeqHolder</item>
-      <item>WStringValueHelper</item>
-      <item>WeakHashMap</item>
-      <item>WeakReference</item>
-      <item>WebRowSet</item>
-      <item>WildcardType</item>
-      <item>Window</item>
-      <item>WindowAdapter</item>
-      <item>WindowConstants</item>
-      <item>WindowEvent</item>
-      <item>WindowFocusListener</item>
-      <item>WindowListener</item>
-      <item>WindowStateListener</item>
-      <item>WrappedPlainView</item>
-      <item>WritableByteChannel</item>
-      <item>WritableRaster</item>
-      <item>WritableRenderedImage</item>
-      <item>WriteAbortedException</item>
-      <item>Writer</item>
-      <item>WrongAdapter</item>
-      <item>WrongAdapterHelper</item>
-      <item>WrongPolicy</item>
-      <item>WrongPolicyHelper</item>
-      <item>WrongTransaction</item>
-      <item>WrongTransactionHelper</item>
-      <item>WrongTransactionHolder</item>
-      <item>X500Principal</item>
-      <item>X500PrivateCredential</item>
-      <item>X509CRL</item>
-      <item>X509CRLEntry</item>
-      <item>X509CRLSelector</item>
-      <item>X509CertSelector</item>
-      <item>X509Certificate</item>
-      <item>X509Certificate</item>
-      <item>X509EncodedKeySpec</item>
-      <item>X509ExtendedKeyManager</item>
-      <item>X509Extension</item>
-      <item>X509KeyManager</item>
-      <item>X509TrustManager</item>
-      <item>XAConnection</item>
-      <item>XADataSource</item>
-      <item>XAException</item>
-      <item>XAResource</item>
-      <item>XMLConstants</item>
-      <item>XMLDecoder</item>
-      <item>XMLEncoder</item>
-      <item>XMLFilter</item>
-      <item>XMLFilterImpl</item>
-      <item>XMLFormatter</item>
-      <item>XMLGregorianCalendar</item>
-      <item>XMLParseException</item>
-      <item>XMLReader</item>
-      <item>XMLReaderAdapter</item>
-      <item>XMLReaderFactory</item>
-      <item>XPath</item>
-      <item>XPathConstants</item>
-      <item>XPathException</item>
-      <item>XPathExpression</item>
-      <item>XPathExpressionException</item>
-      <item>XPathFactory</item>
-      <item>XPathFactoryConfigurationException</item>
-      <item>XPathFunction</item>
-      <item>XPathFunctionException</item>
-      <item>XPathFunctionResolver</item>
-      <item>XPathVariableResolver</item>
-      <item>Xid</item>
-      <item>XmlReader</item>
-      <item>XmlWriter</item>
-      <item>ZipEntry</item>
-      <item>ZipException</item>
-      <item>ZipFile</item>
-      <item>ZipInputStream</item>
-      <item>ZipOutputStream</item>
-      <item>ZoneView</item>
-      <item>_BindingIteratorImplBase</item>
-      <item>_BindingIteratorStub</item>
-      <item>_DynAnyFactoryStub</item>
-      <item>_DynAnyStub</item>
-      <item>_DynArrayStub</item>
-      <item>_DynEnumStub</item>
-      <item>_DynFixedStub</item>
-      <item>_DynSequenceStub</item>
-      <item>_DynStructStub</item>
-      <item>_DynUnionStub</item>
-      <item>_DynValueStub</item>
-      <item>_IDLTypeStub</item>
-      <item>_NamingContextExtStub</item>
-      <item>_NamingContextImplBase</item>
-      <item>_NamingContextStub</item>
-      <item>_PolicyStub</item>
-      <item>_Remote_Stub</item>
-      <item>_ServantActivatorStub</item>
-      <item>_ServantLocatorStub</item>
-    </list>
-    <list name="keywords">
-      <item>abstract</item>
-      <item>case</item>
-      <item>catch</item>
-      <item>class</item>
-      <item>def</item>
-      <item>do</item>
-      <item>else</item>
-      <item>extends</item>
-      <item>false</item>
-      <item>final</item>
-      <item>finally</item>
-      <item>for</item>
-      <item>forSome</item>
-      <item>if</item>
-      <item>implicit</item>
-      <item>import</item>
-      <item>lazy</item>
-      <item>match</item>
-      <item>new</item>
-      <item>null</item>
-      <item>object</item>
-      <item>override</item>
-      <item>package</item>
-      <item>private</item>
-      <item>protected</item>
-      <item>requires</item>
-      <item>return</item>
-      <item>sealed</item>
-      <item>super</item>
-      <item>this</item>
-      <item>throw</item>
-      <item>trait</item>
-      <item>true</item>
-      <item>try</item>
-      <item>type</item>
-      <item>val</item>
-      <item>var</item>
-      <item>while</item>
-      <item>with</item>
-      <item>yield</item>
-    </list>
-    <list name="types">
-      <item>boolean</item>
-      <item>byte</item>
-      <item>char</item>
-      <item>double</item>
-      <item>float</item>
-      <item>int</item>
-      <item>long</item>
-      <item>short</item>
-      <item>unit</item>
-    </list>
-    <contexts>
-      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-        <!-- Comment next line if you don't use Javadoc tool -->
-        <IncludeRules context="##Javadoc"/>
-        <keyword attribute="Keyword" context="#stay" String="keywords"/>
-        <keyword attribute="Data Type" context="#stay" String="types"/>
-        <keyword attribute="Java15" context="#stay" String="java15"/>
-        <keyword attribute="Scala2" context="#stay" String="scala2"/>
-        <Float attribute="Float" context="Float Suffixes"/>
-        <HlCOct attribute="Octal" context="#stay"/>
-        <HlCHex attribute="Hex" context="#stay"/>
-        <Int attribute="Decimal" context="Int Suffixes"/>
-        <HlCChar attribute="Char" context="#stay"/>
-        <RegExpr attribute="Decimal" context="#stay" String="//\s*BEGIN.*$" beginRegion="Region1"/>
-        <RegExpr attribute="Decimal" context="#stay" String="//\s*END.*$" endRegion="Region1"/>
-        <DetectChar attribute="String" context="String" char="&quot;"/>
-        <RegExpr attribute="Function" context="Printf" String="\.(format|printf)\b" />
-        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
-        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
-        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1"/>
-        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"/>
-<!--
-        <RegExpr attribute="Keyword" context="#stay" String="\.{3,3}\s+" />
-        <RegExpr attribute="Keyword" context="StaticImports" String="\b(import\s+static)\b" />
-        <RegExpr attribute="Keyword" context="Imports" String="\b(package|import)\b" />
--->
-        <RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*(/\*\s*\d+\s*\*/\s*)?[(])" />
-        <DetectChar attribute="Symbol" context="Member" char="." />
-        <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/*&lt;=&gt;?[]|~^&#59;"/>
-      </context>
-      <context name="Float Suffixes" attribute="Float" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-          <AnyChar String="fF" attribute="Float" context="#pop"/>
-      </context>
-      <context name="Int Suffixes" attribute="Decimal" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-          <StringDetect attribute="Decimal" context="#pop" String="ULL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LUL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LLU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="UL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LU" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="LL" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="U" insensitive="true"/>
-          <StringDetect attribute="Decimal" context="#pop" String="L" insensitive="true"/>
-      </context>
-      <context attribute="String" lineEndContext="#pop" name="String">
-        <LineContinue attribute="String" context="#stay"/>
-        <HlCStringChar attribute="String Char" context="#stay"/>
-        <DetectChar attribute="String" context="#pop" char="&quot;"/>
-      </context>
-      <context attribute="Normal Text" lineEndContext="#pop" name="Printf">
-        <DetectChar attribute="Normal Text" context="#pop" char="&#059;" />
-        <DetectChar attribute="String" context="PrintfString" char="&quot;"/>
-      </context>
-      <context attribute="PrintfString" lineEndContext="#pop" name="PrintfString">
-        <LineContinue attribute="String" context="#stay"/>
-        <HlCStringChar attribute="String Char" context="#stay"/>
-        <DetectChar attribute="String" context="#pop" char="&quot;"/>
-        <RegExpr attribute="String Char" context="#stay" String="%(\d+\$)?(-|#|\+|\ |0|,|\()*\d*(\.\d+)?[a-hosxA-CEGHSX]" />
-        <RegExpr attribute="String Char" context="#stay" String="%(\d+\$)?(-|#|\+|\ |0|,|\()*\d*(t|T)(a|A|b|B|c|C|d|D|e|F|h|H|I|j|k|l|L|m|M|N|p|P|Q|r|R|s|S|T|y|Y|z|Z)" />
-        <RegExpr attribute="String Char" context="#stay" String="%(%|n)" />
-      </context>
-      <context attribute="Normal Text" lineEndContext="#pop" name="Member" fallthrough="true" fallthroughContext="#pop">
-        <RegExpr attribute="Function" context="#pop" String="\b[_a-zA-Z]\w*(?=[\s]*)" />
-      </context>
-<!--
-      <context attribute="Normal Text" lineEndContext="#pop" name="StaticImports">
-        <RegExpr attribute="StaticImports" context="#pop" String="\s*.*$" />
-      </context>
-      <context attribute="Normal Text" lineEndContext="#pop" name="Imports">
-        <RegExpr attribute="Imports" context="#pop" String="\s*.*$" />
-      </context>
--->
-      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
-        <DetectSpaces />
-        <IncludeRules context="##Comments" />
-      </context>
-      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
-        <DetectSpaces />
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
-        <IncludeRules context="##Comments" />
-      </context>
-    </contexts>
-    <itemDatas>
-      <itemData name="Normal Text"  defStyleNum="dsNormal"/>
-      <itemData name="Keyword"      defStyleNum="dsKeyword"/>
-      <itemData name="Function"     defStyleNum="dsFunction"/>
-<!--       <itemData name="StaticImports"      defStyleNum="dsKeyword" color="#800080" selColor="#FFFFFF" bold="0" italic="0"/> -->
-<!--       <itemData name="Imports"      defStyleNum="dsKeyword" color="#808000" selColor="#FFFFFF" bold="0" italic="0"/> -->
-      <itemData name="Data Type"    defStyleNum="dsDataType"/>
-      <itemData name="Decimal"      defStyleNum="dsDecVal"/>
-      <itemData name="Octal"        defStyleNum="dsBaseN"/>
-      <itemData name="Hex"          defStyleNum="dsBaseN"/>
-      <itemData name="Float"        defStyleNum="dsFloat"/>
-      <itemData name="Char"         defStyleNum="dsChar"/>
-      <itemData name="String"       defStyleNum="dsString"/>
-      <itemData name="String Char"  defStyleNum="dsChar"/>
-      <itemData name="PrintfString" defStyleNum="dsString"/>
-      <itemData name="Comment"      defStyleNum="dsComment"/>
-      <itemData name="Symbol"       defStyleNum="dsNormal"/>
-      <itemData name="Scala2"       defStyleNum="dsNormal" color="#0095FF" selColor="#FFFFFF" bold="1" italic="0"/>
-      <itemData name="Java15"       defStyleNum="dsNormal" color="#0095FF" selColor="#FFFFFF" bold="1" italic="0"/>
+<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)">
+<!--
+adapted from "java.xml" by Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)
+-->
+  <highlighting>
+    <list name="scala2">
+      <item>Actor</item>
+      <item>ActorProxy</item>
+      <item>ActorTask</item>
+      <item>ActorThread</item>
+      <item>AllRef</item>
+      <item>Any</item>
+      <item>AnyRef</item>
+      <item>Application</item>
+      <item>AppliedType</item>
+      <item>Array</item>
+      <item>ArrayBuffer</item>
+      <item>Attribute</item>
+      <item>BoxedArray</item>
+      <item>BoxedBooleanArray</item>
+      <item>BoxedByteArray</item>
+      <item>BoxedCharArray</item>
+      <item>Buffer</item>
+      <item>BufferedIterator</item>
+      <item>Char</item>
+      <item>Console</item>
+      <item>Enumeration</item>
+      <item>Fluid</item>
+      <item>Function</item>
+      <item>IScheduler</item>
+      <item>ImmutableMapAdaptor</item>
+      <item>ImmutableSetAdaptor</item>
+      <item>Int</item>
+      <item>Iterable</item>
+      <item>List</item>
+      <item>ListBuffer</item>
+      <item>None</item>
+      <item>Option</item>
+      <item>Ordered</item>
+      <item>Pair</item>
+      <item>PartialFunction</item>
+      <item>Pid</item>
+      <item>Predef</item>
+      <item>PriorityQueue</item>
+      <item>PriorityQueueProxy</item>
+      <item>Reaction</item>
+      <item>Ref</item>
+      <item>Responder</item>
+      <item>RichInt</item>
+      <item>RichString</item>
+      <item>Rule</item>
+      <item>RuleTransformer</item>
+      <item>Script</item>
+      <item>Seq</item>
+      <item>SerialVersionUID</item>
+      <item>Some</item>
+      <item>Stream</item>
+      <item>Symbol</item>
+      <item>TcpService</item>
+      <item>TcpServiceWorker</item>
+      <item>Triple</item>
+      <item>Unit</item>
+      <item>Value</item>
+      <item>WorkerThread</item>
+      <item>serializable</item>
+      <item>transient</item>
+      <item>volatile</item>
+    </list>
+    <list name="java15">
+      <include>java15##Java</include>
+    </list>
+    <list name="keywords">
+      <item>abstract</item>
+      <item>class</item>
+      <item>def</item>
+      <item>extends</item>
+      <item>false</item>
+      <item>final</item>
+      <item>forSome</item>
+      <item>implicit</item>
+      <item>import</item>
+      <item>lazy</item>
+      <item>new</item>
+      <item>null</item>
+      <item>object</item>
+      <item>override</item>
+      <item>package</item>
+      <item>private</item>
+      <item>protected</item>
+      <item>requires</item>
+      <item>sealed</item>
+      <item>super</item>
+      <item>this</item>
+      <item>trait</item>
+      <item>true</item>
+      <item>type</item>
+      <item>val</item>
+      <item>var</item>
+      <item>with</item>
+    </list>
+    <list name="control flow">
+      <item>case</item>
+      <item>catch</item>
+      <item>do</item>
+      <item>else</item>
+      <item>finally</item>
+      <item>for</item>
+      <item>if</item>
+      <item>match</item>
+      <item>return</item>
+      <item>throw</item>
+      <item>try</item>
+      <item>while</item>
+      <item>yield</item>
+    </list>
+    <list name="types">
+      <item>boolean</item>
+      <item>byte</item>
+      <item>char</item>
+      <item>double</item>
+      <item>float</item>
+      <item>int</item>
+      <item>long</item>
+      <item>short</item>
+      <item>unit</item>
+    </list>
+    <contexts>
+      <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
+        <DetectSpaces context="#stay"/>
+
+        <!-- Comment next line if you don't use Javadoc tool -->
+        <IncludeRules context="##Javadoc"/>
+        <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
+        <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
+
+        <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1"/>
+        <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1"/>
+        <Float attribute="Float" context="Float Suffixes"/>
+        <AnyChar attribute="Symbol" context="#stay" String=".()[]&amp;|+,-/*&lt;=&gt;;!%?:~^"/>
+        <HlCHex attribute="Hex" context="Int Suffixes"/>
+        <Int attribute="Decimal" context="Int Suffixes"/>
+
+        <DetectChar attribute="String" context="String" char="&quot;"/>
+        <DetectChar context="Char" char="'" lookAhead="1"/>
+        <Detect2Chars attribute="String Interpolation" context="StringInterpolatorS" char="s" char1="&quot;"/>
+        <Detect2Chars attribute="String Interpolation" context="StringInterpolatorF" char="f" char1="&quot;"/>
+        <StringDetect attribute="Raw String" context="StringInterpolatorRaw" String="raw&quot;"/>
+
+        <keyword attribute="Keyword" context="#stay" String="keywords"/>
+        <keyword attribute="Control Flow" context="#stay" String="control flow"/>
+        <keyword attribute="Data Type" context="#stay" String="types"/>
+        <keyword attribute="Java15" context="#stay" String="java15"/>
+        <keyword attribute="Scala2" context="#stay" String="scala2"/>
+
+        <RegExpr attribute="Function" context="#stay" String="\b[_a-zA-Z]\w*(?=[\s]*(?:/\*\s*\d+\s*\*/\s*)?[(])" />
+        <DetectIdentifier context="#stay"/>
+      </context>
+
+      <context attribute="Float" lineEndContext="#pop" name="Float Suffixes" fallthroughContext="#pop">
+        <AnyChar attribute="Float" context="#pop" String="fdFD"/>
+      </context>
+      <context attribute="Decimal" lineEndContext="#pop" name="Int Suffixes" fallthroughContext="#pop">
+        <AnyChar attribute="Decimal" context="#pop" String="Ll"/>
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#stay" name="Char">
+        <HlCChar attribute="Char" context="#pop"/>
+        <RegExpr attribute="Char" context="#pop" String="'\\u+[0-9a-fA-F]{4}'"/>
+        <RegExpr attribute="Error" context="#pop" String="'(\\(u+[0-9a-fA-F]*|.))?'?"/>
+      </context>
+
+      <context attribute="String" lineEndContext="#pop" name="String" fallthroughContext="#pop!SingleLineString">
+        <Detect2Chars attribute="String" context="#pop!MultiLineString" char="&quot;" char1="&quot;"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#pop" name="SingleLineString">
+        <DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="MultiLineString">
+        <DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+        <DetectChar context="MultiLineStringFinal" char="&quot;" lookAhead="1"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="MultiLineStringFinal">
+        <StringDetect context="MultiLineStringNoFinal" String="&quot;&quot;&quot;&quot;" lookAhead="1"/>
+        <StringDetect attribute="String" context="#pop#pop" String="&quot;&quot;&quot;"/>
+        <Detect2Chars attribute="String" context="#pop" char="&quot;" char1="&quot;"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="MultiLineStringNoFinal">
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#pop" name="StringEscapedChar">
+        <HlCStringChar attribute="String Char" context="#pop"/>
+        <RegExpr attribute="String Char" context="#pop" String="\\u+[0-9a-fA-F]{4}"/>
+        <RegExpr attribute="Error" context="#pop" String="\\(u+[0-9a-fA-F]*|.)?"/>
+      </context>
+
+      <context attribute="String" lineEndContext="#pop" name="StringInterpolatorS" fallthroughContext="#pop!SingleLineStringInterpolatorS">
+        <Detect2Chars attribute="String Interpolation" context="#pop!MultiLineStringInterpolatorS" char="&quot;" char1="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#pop" name="SingleLineStringInterpolatorS">
+        <DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+        <DetectChar context="Interpolation" char="$" lookAhead="1"/>
+        <DetectChar attribute="String Interpolation" context="#pop" char="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="MultiLineStringInterpolatorS">
+        <DetectChar context="Interpolation" char="$" lookAhead="1"/>
+        <DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+        <DetectChar context="MultiLineStringInterpolarFinal" char="&quot;" lookAhead="1"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="MultiLineStringInterpolarFinal">
+        <StringDetect context="MultiLineStringInterpolarNoFinal" String="&quot;&quot;&quot;&quot;" lookAhead="1"/>
+        <StringDetect attribute="String Interpolation" context="#pop#pop" String="&quot;&quot;&quot;"/>
+        <Detect2Chars attribute="String" context="#pop" char="&quot;" char1="&quot;"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="MultiLineStringInterpolarNoFinal">
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="Interpolation">
+        <Detect2Chars attribute="String Interpolation" context="#pop!InInterpolation" char="$" char1="{"/>
+        <Detect2Chars attribute="String Char" context="#pop" char="$" char1="$"/>
+        <DetectChar attribute="String Interpolation" context="#pop!Variable" char="$"/>
+      </context>
+      <context attribute="String Interpolation" lineEndContext="#stay" name="InInterpolation">
+        <DetectChar attribute="String Interpolation" context="#pop" char="}"/>
+        <IncludeRules context="Normal"/>
+      </context>
+      <context attribute="String" lineEndContext="#pop" name="Variable" fallthroughContext="#pop">
+        <DetectIdentifier attribute="String Interpolation" context="#pop"/>
+      </context>
+
+      <context attribute="String" lineEndContext="#pop" name="StringInterpolatorF" fallthroughContext="#pop!SingleLineStringInterpolatorF">
+        <Detect2Chars attribute="String Interpolation" context="#pop!MultiLineStringInterpolatorF" char="&quot;" char1="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#pop" name="SingleLineStringInterpolatorF">
+        <Detect2Chars attribute="String Interpolation" context="InInterpolation" char="$" char1="{"/>
+        <Detect2Chars attribute="String Char" context="#stay" char="$" char1="$"/>
+        <DetectChar attribute="String Interpolation" context="VariableF" char="$"/>
+        <DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+        <DetectChar attribute="String Interpolation" context="#pop" char="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="MultiLineStringInterpolatorF">
+        <Detect2Chars attribute="String Interpolation" context="InInterpolation" char="$" char1="{"/>
+        <Detect2Chars attribute="String Char" context="#stay" char="$" char1="$"/>
+        <DetectChar attribute="String Interpolation" context="VariableF" char="$"/>
+        <DetectChar context="StringEscapedChar" char="\" lookAhead="1"/>
+        <DetectChar context="MultiLineStringInterpolarFinal" char="&quot;" lookAhead="1"/>
+      </context>
+      <context attribute="String" lineEndContext="#pop" name="VariableF" fallthroughContext="#pop">
+        <DetectIdentifier attribute="String Interpolation" context="#pop!PrintfString"/>
+      </context>
+      <context attribute="String" lineEndContext="#pop" name="PrintfString" fallthroughContext="#pop">
+        <RegExpr attribute="String Interpolation" context="#stay" String="%((\d+\$)?[-#+ 0,(]*\d*((\.\d+)?[a-hosxA-CEGHSX]|[tT][aAbBcCdDeFhHIjklLmMNpPQrRsSTyYzZ])|[%n])" />
+      </context>
+
+      <context attribute="String" lineEndContext="#pop" name="StringInterpolatorRaw" fallthroughContext="#pop!SingleLineStringInterpolatorRaw">
+        <Detect2Chars attribute="Raw String" context="#pop!MultiLineStringInterpolatorRaw" char="&quot;" char1="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#pop" name="SingleLineStringInterpolatorRaw">
+        <DetectChar context="Interpolation" char="$" lookAhead="1"/>
+        <DetectChar attribute="Raw String" context="#pop" char="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="MultiLineStringInterpolatorRaw">
+        <DetectChar context="Interpolation" char="$" lookAhead="1"/>
+        <DetectChar context="MultiLineStringInterpolarRawFinal" char="&quot;" lookAhead="1"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="MultiLineStringInterpolarRawFinal">
+        <StringDetect context="MultiLineStringInterpolarRawNoFinal" String="&quot;&quot;&quot;&quot;" lookAhead="1"/>
+        <StringDetect attribute="Raw String" context="#pop#pop" String="&quot;&quot;&quot;"/>
+        <Detect2Chars attribute="String" context="#pop" char="&quot;" char1="&quot;"/>
+        <DetectChar attribute="String" context="#pop" char="&quot;"/>
+      </context>
+      <context attribute="String" lineEndContext="#stay" name="MultiLineStringInterpolarRawNoFinal">
+        <DetectChar attribute="Raw String" context="#pop" char="&quot;"/>
+      </context>
+
+      <context attribute="Comment" lineEndContext="#pop" name="Commentar 1">
+        <DetectSpaces />
+        <IncludeRules context="##Comments" />
+      </context>
+      <context attribute="Comment" lineEndContext="#stay" name="Commentar 2">
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment"/>
+        <IncludeRules context="##Comments" />
+      </context>
+
+    </contexts>
+    <itemDatas>
+      <itemData name="Normal Text"  defStyleNum="dsNormal" spellChecking="false"/>
+      <itemData name="Keyword"      defStyleNum="dsKeyword" spellChecking="false"/>
+      <itemData name="Control Flow" defStyleNum="dsControlFlow" spellChecking="false"/>
+      <itemData name="Function"     defStyleNum="dsFunction" spellChecking="false"/>
+      <itemData name="Data Type"    defStyleNum="dsDataType" spellChecking="false"/>
+      <itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
+      <itemData name="Hex"          defStyleNum="dsBaseN" spellChecking="false"/>
+      <itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
+      <itemData name="Char"         defStyleNum="dsChar" spellChecking="false"/>
+      <itemData name="String"       defStyleNum="dsString"/>
+      <itemData name="String Char"  defStyleNum="dsChar" spellChecking="false"/>
+      <itemData name="Raw String"   defStyleNum="dsVerbatimString"/>
+      <itemData name="String Interpolation" defStyleNum="dsSpecialString"/>
+      <itemData name="Comment"      defStyleNum="dsComment"/>
+      <itemData name="Symbol"       defStyleNum="dsOperator" spellChecking="false"/>
+      <itemData name="Scala2"       defStyleNum="dsBuiltIn"/>
+      <itemData name="Java15"       defStyleNum="dsExtension"/>
+      <itemData name="Error"        defStyleNum="dsError"/>
     </itemDatas>
   </highlighting>
   <general>
diff --git a/xml/sci.xml b/xml/sci.xml
--- a/xml/sci.xml
+++ b/xml/sci.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="scilab" version="6" kateversion="2.2" section="Scientific" extensions="*.sci;*.sce" mimetype="text/x-sci">
+<language name="scilab" version="6" kateversion="5.0" section="Scientific" extensions="*.sci;*.sce" mimetype="text/x-sci">
   <highlighting>
     <list name="Structure-keywords">
       <item>do</item>
diff --git a/xml/sed.xml b/xml/sed.xml
--- a/xml/sed.xml
+++ b/xml/sed.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="sed" section="Scripts" version="5" kateversion="2.4" extensions="*.sed" mimetype="text/x-sed" author="Bart Sas (bart.sas@gmail.com)" license="GPL">
+<language name="sed" section="Scripts" version="5" kateversion="5.0" extensions="*.sed" mimetype="text/x-sed" author="Bart Sas (bart.sas@gmail.com)" license="GPL">
         <highlighting>
                 <contexts>
                         <context name="BeginningOfLine" attribute="Normal" lineEndContext="#stay">
diff --git a/xml/sgml.xml b/xml/sgml.xml
--- a/xml/sgml.xml
+++ b/xml/sgml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="SGML" version="4" kateversion="2.2" section="Markup" extensions="*.sgml" mimetype="text/sgml">
+<language name="SGML" version="4" kateversion="5.0" section="Markup" extensions="*.sgml" mimetype="text/sgml">
   <highlighting>
     <contexts>
        <context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
diff --git a/xml/sml.xml b/xml/sml.xml
--- a/xml/sml.xml
+++ b/xml/sml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="SML" version="6" kateversion="2.3" section="Sources" extensions="*.sml;*.ml" mimetype="" author="Christoph Cullmann (cullmann@kde.org)" license="MIT">
+<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">
       <item>abstype</item>
diff --git a/xml/spdx-comments.xml b/xml/spdx-comments.xml
--- a/xml/spdx-comments.xml
+++ b/xml/spdx-comments.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 <language
-    version="1"
+    version="2"
     kateversion="3.1"
     name="SPDX-Comments"
     section="Other"
@@ -517,13 +517,11 @@
     <contexts>
       <context name="Normal" attribute="SPDX Tag" lineEndContext="#pop">
         <WordDetect String="SPDX-License-Identifier:" attribute="SPDX Tag" context="license-expression" />
-        <keyword String="tags" context="value" attribute="SPDX Tag" />
-      </context>
-
-      <context name="value" attribute="SPDX Value" lineEndContext="#pop">
+        <keyword String="tags" attribute="SPDX Tag" />
       </context>
 
-      <context name="license-expression" attribute="SPDX Value" lineEndContext="#pop">
+      <context name="license-expression" attribute="SPDX Value" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
+        <DetectSpaces/>
         <DetectChar char="(" context="#stay" attribute="SPDX License Expression Operator" />
         <DetectChar char=")" context="#stay" attribute="SPDX License Expression Operator" />
         <DetectChar char="+" context="#stay" attribute="SPDX License Expression Operator" />
diff --git a/xml/stata.xml b/xml/stata.xml
--- a/xml/stata.xml
+++ b/xml/stata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Stata" version="12" kateversion="2.3" section="Scientific" extensions="*.do;*.ado;*.doh;*.DO;*.ADO;*.DOH"
+<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" >
 
   <highlighting>
diff --git a/xml/tcsh.xml b/xml/tcsh.xml
--- a/xml/tcsh.xml
+++ b/xml/tcsh.xml
@@ -7,6 +7,7 @@
         <!ENTITY eos      "(?=($|\s))">			<!-- eol or space following -->
         <!ENTITY noword   "(?![\w$+-])">		<!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
+        <!ENTITY tab      "&#9;">
 ]>
 <language name="Tcsh" version="9" kateversion="5.53" section="Scripts" extensions="*.csh;*.tcsh;csh.cshrc;csh.login;.tcshrc;.cshrc;.login" mimetype="application/x-csh" casesensitive="1" author="Matthew Woehlke (mw_triad@users.sourceforge.net)" license="LGPL">
 
@@ -324,7 +325,7 @@
       <context attribute="Normal Text" lineEndContext="#pop" name="CmdSetEnv" fallthrough="true" fallthroughContext="#pop">
         <!-- handle command line options -->
         <RegExpr attribute="Variable" context="#pop" String="\b&varname;" />
-        <RegExpr attribute="Variable" context="Assign" String="\s" />
+        <AnyChar attribute="Variable" context="Assign" String="&tab; " />
         <IncludeRules context="FindMost" />
       </context>
 
diff --git a/xml/texinfo.xml b/xml/texinfo.xml
--- a/xml/texinfo.xml
+++ b/xml/texinfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Texinfo" extensions="*.texi" section="Markup" mimetype="application/x-texinfo" author="Daniel Franke (franke.daniel@gmail.com)" license="LGPL" version="3" kateversion="2.4">
+<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/xml/verilog.xml b/xml/verilog.xml
--- a/xml/verilog.xml
+++ b/xml/verilog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="Verilog" version="6" kateversion="2.4" section="Hardware" extensions="*.v;*.V;*.vl" mimetype="text/x-verilog-src" author="Yevgen Voronenko (ysv22@drexel.edu), Ryan Dalzell (ryan@tullyroan.com)" license="">
+<language name="Verilog" version="6" 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">
       <item>macromodule</item>
diff --git a/xml/xml.xml b/xml/xml.xml
--- a/xml/xml.xml
+++ b/xml/xml.xml
@@ -6,7 +6,7 @@
 	<!ENTITY name    "(?![0-9])[\w_:][\w.:_-]*">
 	<!ENTITY entref  "&amp;(?:#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
 ]>
-<language name="XML" version="11" kateversion="3.4" 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" casesensitive="1" indenter="xml" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="XML" version="11" 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" casesensitive="1" indenter="xml" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <highlighting>
 <contexts>
diff --git a/xml/xorg.xml b/xml/xorg.xml
--- a/xml/xorg.xml
+++ b/xml/xorg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="x.org Configuration" section="Configuration" extensions="xorg.conf" mimetype="" version="4" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<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>
 <contexts>
diff --git a/xml/xul.xml b/xml/xul.xml
--- a/xml/xul.xml
+++ b/xml/xul.xml
@@ -465,8 +465,7 @@
   <context name="Element" attribute="Normal Text" lineEndContext="#stay">
     <Detect2Chars attribute="Element" context="#pop" char="/" char1="&gt;" endRegion="element" />
     <DetectChar attribute="Element" context="El Content" char="&gt;" />
-    <RegExpr attribute="Attribute" context="Attribute" String="^&name;" />
-    <RegExpr attribute="Attribute" context="Attribute" String="\s+&name;" />
+    <RegExpr attribute="Attribute" context="Attribute" String="^&name;|\s+&name;" />
     <RegExpr attribute="Error" context="#stay" String="\S" />
   </context>