Merge remote-tracking branch 'origin/4.4'

 Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qbsprojectmanager/qbsproject.h

Change-Id: I6b9cdf704be95ade02488c8b19582b6621282fb8

96 files changed, 7764 insertions, 7363 deletions

diff --git a/src/app/app.pro b/src/app/app.pro
index 4d6030bfe7f..a2313575fee 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -20,9 +20,11 @@ win32 {
     # We need the version in two separate formats for the .rc file
     #  RC_VERSION=4,3,82,0 (quadruple)
     #  RC_VERSION_STRING="4.4.0-beta1" (free text)
+    # Also, we need to replace space with \x20 to be able to work with both rc and windres
+    COPYRIGHT = "2008-$${QTCREATOR_COPYRIGHT_YEAR} The Qt Company Ltd"
     DEFINES += RC_VERSION=$$replace(QTCREATOR_VERSION, "\\.", ","),0 \
-        RC_VERSION_STRING=\\\"$${QTCREATOR_DISPLAY_VERSION}\\\" \
-        RC_COPYRIGHT='"\\\"2008-$${QTCREATOR_COPYRIGHT_YEAR} The Qt Company Ltd\\\""'
+        RC_VERSION_STRING=\"$${QTCREATOR_DISPLAY_VERSION}\" \
+        RC_COPYRIGHT=\"$$replace(COPYRIGHT, " ", "\\x20")\"
     RC_FILE = qtcreator.rc
 } else:macx {
     LIBS += -framework CoreFoundation
diff --git a/src/app/app.qbs b/src/app/app.qbs
index b3023fcbe74..b67ff28a2c4 100644
--- a/src/app/app.qbs
+++ b/src/app/app.qbs
@@ -54,9 +54,11 @@ QtcProduct {
         // We need the version in two separate formats for the .rc file
         //  RC_VERSION=4,3,82,0 (quadruple)
         //  RC_VERSION_STRING="4.4.0-beta1" (free text)
+        // Also, we need to replace space with \x20 to be able to work with both rc and windres
         cpp.defines: outer.concat(["RC_VERSION=" + qtc.qtcreator_version.replace(/\./g, ",") + ",0",
-                                   "RC_VERSION_STRING=\"" + qtc.qtcreator_display_version + "\"",
-                                   "RC_COPYRIGHT=\"2008-" + qtc.qtcreator_copyright_year + " The Qt Company Ltd\""])
+                                   "RC_VERSION_STRING=" + qtc.qtcreator_display_version,
+                                   "RC_COPYRIGHT=2008-" + qtc.qtcreator_copyright_year
+                                   + " The Qt Company Ltd".replace(/ /g, "\\x20")])
         files: "qtcreator.rc"
     }
 
diff --git a/src/app/qtcreator.rc b/src/app/qtcreator.rc
index 89f03c4708c..bcc6e7f8ab8 100644
--- a/src/app/qtcreator.rc
+++ b/src/app/qtcreator.rc
@@ -1,5 +1,8 @@
 #include <windows.h>
 
+#define STRINGIFY1(x) #x
+#define STRINGIFY(x) STRINGIFY1(x)
+
 IDI_ICON1               ICON    DISCARDABLE     "qtcreator.ico"
 IDI_ICON2               ICON    DISCARDABLE     "winicons/c.ico"
 IDI_ICON3               ICON    DISCARDABLE     "winicons/cpp.ico"
@@ -19,10 +22,10 @@ VS_VERSION_INFO VERSIONINFO
        BLOCK "040904E4"
        {
           VALUE "FileDescription", "Qt Creator"
-          VALUE "FileVersion", RC_VERSION_STRING
+          VALUE "FileVersion", STRINGIFY(RC_VERSION_STRING)
           VALUE "ProductName", "Qt Creator"
-          VALUE "ProductVersion", RC_VERSION_STRING
-          VALUE "LegalCopyright", RC_COPYRIGHT
+          VALUE "ProductVersion", STRINGIFY(RC_VERSION_STRING)
+          VALUE "LegalCopyright", STRINGIFY(RC_COPYRIGHT)
         }
     }
     BLOCK "VarFileInfo"
diff --git a/src/libs/3rdparty/cplusplus/ASTPatternBuilder.cpp b/src/libs/3rdparty/cplusplus/ASTPatternBuilder.cpp
deleted file mode 100644
index 0c1549e51b8..00000000000
--- a/src/libs/3rdparty/cplusplus/ASTPatternBuilder.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "ASTPatternBuilder.h"
diff --git a/src/libs/3rdparty/cplusplus/ObjectiveCAtKeywords.cpp b/src/libs/3rdparty/cplusplus/ObjectiveCAtKeywords.cpp
index d05222c681a..8177368d7f1 100644
--- a/src/libs/3rdparty/cplusplus/ObjectiveCAtKeywords.cpp
+++ b/src/libs/3rdparty/cplusplus/ObjectiveCAtKeywords.cpp
@@ -1,3 +1,22 @@
+// Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 #include "Lexer.h"
 #include "Token.h"
diff --git a/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.cpp b/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.cpp
index 6b85bf4a1b1..6005fe574fc 100644
--- a/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.cpp
+++ b/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.cpp
@@ -1,3 +1,22 @@
+// Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 #include "ObjectiveCTypeQualifiers.h"
 
diff --git a/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.h b/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.h
index ac46bd6070f..3f920e5bfc2 100644
--- a/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.h
+++ b/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.h
@@ -1,9 +1,27 @@
-#ifndef CPLUSPLUS_OBJC_TYPEQUALIFIERS_H
-#define CPLUSPLUS_OBJC_TYPEQUALIFIERS_H
+// Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#pragma once
 
 #include "CPlusPlusForwardDeclarations.h"
 
-
 namespace CPlusPlus {
 
 enum {
@@ -27,6 +45,3 @@ enum {
 CPLUSPLUS_EXPORT int classifyObjectiveCContextKeyword(const char *s, int n);
 
 } // namespace CPlusPlus
-
-
-#endif // CPLUSPLUS_OBJC_TYPEQUALIFIERS_H
diff --git a/src/libs/3rdparty/cplusplus/QtContextKeywords.cpp b/src/libs/3rdparty/cplusplus/QtContextKeywords.cpp
index 87403aed14f..ce7bd0a1dde 100644
--- a/src/libs/3rdparty/cplusplus/QtContextKeywords.cpp
+++ b/src/libs/3rdparty/cplusplus/QtContextKeywords.cpp
@@ -1,3 +1,22 @@
+// Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 #include "QtContextKeywords.h"
 
diff --git a/src/libs/3rdparty/cplusplus/QtContextKeywords.h b/src/libs/3rdparty/cplusplus/QtContextKeywords.h
index edef73a7ee8..42dce9b917d 100644
--- a/src/libs/3rdparty/cplusplus/QtContextKeywords.h
+++ b/src/libs/3rdparty/cplusplus/QtContextKeywords.h
@@ -1,3 +1,22 @@
+// Copyright (c) 2008 Roberto Raggi <roberto.raggi@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
 #pragma once
 
diff --git a/src/libs/3rdparty/cplusplus/SafeMatcher.h b/src/libs/3rdparty/cplusplus/SafeMatcher.h
index 98219eeffdc..98fbbae2aa2 100644
--- a/src/libs/3rdparty/cplusplus/SafeMatcher.h
+++ b/src/libs/3rdparty/cplusplus/SafeMatcher.h
@@ -23,8 +23,7 @@
 **
 ****************************************************************************/
 
-#ifndef CPLUSPLUS_SAFETYPEMATCHER_H
-#define CPLUSPLUS_SAFETYPEMATCHER_H
+#pragma once
 
 #include "Matcher.h"
 
@@ -56,5 +55,3 @@ private:
 };
 
 } // CPlusPlus namespace
-
-#endif // CPLUSPLUS_SAFETYPEMATCHER_H
diff --git a/src/libs/3rdparty/cplusplus/cplusplus.pri b/src/libs/3rdparty/cplusplus/cplusplus.pri
index 025519ef89c..2a4f71a7122 100644
--- a/src/libs/3rdparty/cplusplus/cplusplus.pri
+++ b/src/libs/3rdparty/cplusplus/cplusplus.pri
@@ -40,7 +40,6 @@ SOURCES += \
     $$PWD/ASTMatch0.cpp \
     $$PWD/ASTVisitor.cpp \
     $$PWD/ASTClone.cpp \
-    $$PWD/ASTPatternBuilder.cpp \
     $$PWD/ASTMatcher.cpp \
     $$PWD/Matcher.cpp \
     $$PWD/Control.cpp \
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index c9aae72b3e3..a0e0d66178c 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -30,7 +30,6 @@ Project {
                 "ASTMatch0.cpp",
                 "ASTMatcher.cpp",
                 "ASTMatcher.h",
-                "ASTPatternBuilder.cpp",
                 "ASTPatternBuilder.h",
                 "ASTVisit.cpp",
                 "ASTVisitor.cpp",
diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp
index cde1903099f..8fd64007a29 100644
--- a/src/libs/extensionsystem/pluginspec.cpp
+++ b/src/libs/extensionsystem/pluginspec.cpp
@@ -32,6 +32,7 @@
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
+#include <utils/stringutils.h>
 
 #include <QCoreApplication>
 #include <QDebug>
@@ -631,26 +632,6 @@ static inline QString msgInvalidFormat(const char *key, const QString &content)
             .arg(QLatin1String(key), content);
 }
 
-bool PluginSpec::readMultiLineString(const QJsonValue &value, QString *out)
-{
-    QTC_ASSERT(out, return false);
-    if (value.isString()) {
-        *out = value.toString();
-    } else if (value.isArray()) {
-        QJsonArray array = value.toArray();
-        QStringList lines;
-        foreach (const QJsonValue &v, array) {
-            if (!v.isString())
-                return false;
-            lines.append(v.toString());
-        }
-        *out = lines.join(QLatin1Char('\n'));
-    } else {
-        return false;
-    }
-    return true;
-}
-
 /*!
     \internal
 */
@@ -735,7 +716,7 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
     copyright = value.toString();
 
     value = metaData.value(QLatin1String(DESCRIPTION));
-    if (!value.isUndefined() && !PluginSpec::readMultiLineString(value, &description))
+    if (!value.isUndefined() && !Utils::readMultiLineString(value, &description))
         return reportError(msgValueIsNotAString(DESCRIPTION));
 
     value = metaData.value(QLatin1String(URL));
@@ -749,7 +730,7 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
     category = value.toString();
 
     value = metaData.value(QLatin1String(LICENSE));
-    if (!value.isUndefined() && !PluginSpec::readMultiLineString(value, &license))
+    if (!value.isUndefined() && !Utils::readMultiLineString(value, &license))
         return reportError(msgValueIsNotAMultilineString(LICENSE));
 
     value = metaData.value(QLatin1String(PLATFORM));
@@ -799,7 +780,7 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
                 } else if (typeValue.toLower() == QLatin1String(DEPENDENCY_TYPE_TEST)) {
                     dep.type = PluginDependency::Test;
                 } else {
-                    return reportError(tr("Dependency: \"%1\" must be \"%2\" or \"%3\" (is \"%4\")")
+                    return reportError(tr("Dependency: \"%1\" must be \"%2\" or \"%3\" (is \"%4\").")
                                        .arg(QLatin1String(DEPENDENCY_TYPE),
                                             QLatin1String(DEPENDENCY_TYPE_HARD),
                                             QLatin1String(DEPENDENCY_TYPE_SOFT),
diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h
index da89ff6029f..0462acddefe 100644
--- a/src/libs/extensionsystem/pluginspec.h
+++ b/src/libs/extensionsystem/pluginspec.h
@@ -131,8 +131,6 @@ public:
     bool hasError() const;
     QString errorString() const;
 
-    static bool readMultiLineString(const QJsonValue &value, QString *out);
-
 private:
     PluginSpec();
 
diff --git a/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
index ddaeafc29f1..614069e0b37 100644
--- a/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
+++ b/src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
@@ -758,6 +758,13 @@ void ModelController::moveObject(MPackage *newOwner, MObject *object)
     QMT_ASSERT(object, return);
     QMT_ASSERT(object != m_rootPackage, return);
 
+    // verify that newOwner is not a child of object
+    MObject *newOwnerObject = newOwner;
+    while (newOwnerObject && newOwnerObject != object)
+        newOwnerObject = newOwnerObject->owner();
+    if (newOwnerObject == object)
+        return;
+
     if (newOwner != object->owner()) {
         int formerRow = 0;
         MObject *formerOwner = object->owner();
diff --git a/src/libs/qtcreatorcdbext/qtcreatorcdbext.qbs b/src/libs/qtcreatorcdbext/qtcreatorcdbext.qbs
index 1e1edbefb32..2243c217586 100644
--- a/src/libs/qtcreatorcdbext/qtcreatorcdbext.qbs
+++ b/src/libs/qtcreatorcdbext/qtcreatorcdbext.qbs
@@ -2,6 +2,8 @@ import qbs
 import qbs.Environment
 import qbs.File
 import qbs.FileInfo
+import qbs.Process
+import qbs.Utilities
 
 QtcLibrary {
     condition: qbs.toolchain.contains("msvc") && cdbPath
@@ -45,11 +47,98 @@ QtcLibrary {
         }
         return undefined;
     }
-    cpp.includePaths: [FileInfo.joinPaths(cdbPath, "inc")]
-    cpp.dynamicLibraries: [
-        "user32.lib",
-        FileInfo.joinPaths(cdbLibPath, "dbgeng.lib")
-    ]
+
+    property string pythonInstallDir: Environment.getEnv("PYTHON_INSTALL_DIR")
+
+    Probe {
+        id: pythonDllProbe
+        condition: product.condition
+        property string pythonDir: pythonInstallDir // Input
+        property string buildVariant: qbs.buildVariant // Input
+        property string fileNamePrefix // Output
+        configure: {
+            function printWarning(msg) {
+                console.warn(msg + " The python dumpers for cdb will not be available.");
+            }
+
+            if (!pythonDir) {
+                printWarning("PYTHON_INSTALL_DIR not set.");
+                return;
+            }
+            if (!File.exists(pythonDir)) {
+                printWarning("The provided python installation directory '" + pythonDir
+                             + "' does not exist.");
+                return;
+            }
+            var p = new Process();
+            try {
+                var pythonFilePath = FileInfo.joinPaths(pythonDir, "python.exe");
+                p.exec(pythonFilePath, ["--version"], true);
+                var output = p.readStdOut().trim();
+                var magicPrefix = "Python ";
+                if (!output.startsWith(magicPrefix)) {
+                    printWarning("Unexpected python output when checking for version: '"
+                                 + output + "'");
+                    return;
+                }
+                var versionNumberString = output.slice(magicPrefix.length);
+                var versionNumbers = versionNumberString.split('.');
+                if (versionNumbers.length < 2) {
+                    printWarning("Unexpected python output when checking for version: '"
+                            + output + "'");
+                    return;
+                }
+                if (Utilities.versionCompare(versionNumberString, "3.5") < 0) {
+                    printWarning("The python installation at '" + pythonDir
+                                 + "' has version " + versionNumberString + ", but 3.5 or higher "
+                                 + "is required.");
+                    return;
+                }
+                found = true;
+                fileNamePrefix = "python" + versionNumbers[0] + versionNumbers[1];
+                if (buildVariant === "debug")
+                    fileNamePrefix += "_d"
+            } finally {
+                p.close();
+            }
+
+        }
+    }
+
+    Group {
+        name: "pythonDumper"
+        condition: pythonDllProbe.found
+        files: [
+            "pycdbextmodule.cpp",
+            "pycdbextmodule.h",
+            "pyfield.cpp",
+            "pyfield.h",
+            "pystdoutredirect.cpp",
+            "pystdoutredirect.h",
+            "pytype.cpp",
+            "pytype.h",
+            "pyvalue.cpp",
+            "pyvalue.h",
+        ]
+    }
+
+    Properties {
+        condition: pythonDllProbe.found
+        cpp.defines: ["WITH_PYTHON=1"]
+    }
+    cpp.includePaths: {
+        var paths = [FileInfo.joinPaths(cdbPath, "inc")];
+        if (pythonDllProbe.found)
+            paths.push(FileInfo.joinPaths(pythonInstallDir, "include"));
+        return paths;
+    }
+    cpp.dynamicLibraries: {
+        var libs = [ "user32.lib", FileInfo.joinPaths(cdbLibPath, "dbgeng.lib") ];
+        if (pythonDllProbe.found)
+            libs.push(FileInfo.joinPaths(pythonInstallDir, "libs",
+                                         pythonDllProbe.fileNamePrefix + ".lib"));
+        return libs;
+    }
     cpp.linkerFlags: ["/DEF:" + FileInfo.toWindowsSeparators(
                                     FileInfo.joinPaths(product.sourceDirectory,
                                                        "qtcreatorcdbext.def"))]
@@ -61,6 +150,16 @@ QtcLibrary {
             dirName += "32";
         return FileInfo.joinPaths(qtc.libDirName, dirName);
     }
+
+    Group {
+        condition: pythonDllProbe.found
+        files: [FileInfo.joinPaths(pythonInstallDir, pythonDllProbe.fileNamePrefix + ".dll")]
+        qbs.install: true
+        qbs.installDir: installDir
+    }
+
+    useNonGuiPchFile: false
+
     files: [
         "common.cpp",
         "common.h",
diff --git a/src/libs/utils/highlightingitemdelegate.cpp b/src/libs/utils/highlightingitemdelegate.cpp
new file mode 100644
index 00000000000..fe2525122c8
--- /dev/null
+++ b/src/libs/utils/highlightingitemdelegate.cpp
@@ -0,0 +1,305 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#include "highlightingitemdelegate.h"
+
+#include <QApplication>
+#include <QModelIndex>
+#include <QPainter>
+
+const int kMinimumLineNumberDigits = 6;
+
+namespace Utils {
+
+HighlightingItemDelegate::HighlightingItemDelegate(int tabWidth, QObject *parent)
+    : QItemDelegate(parent)
+{
+    setTabWidth(tabWidth);
+}
+
+void HighlightingItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                                     const QModelIndex &index) const
+{
+    static const int iconSize = 16;
+
+    painter->save();
+
+    const QStyleOptionViewItem opt = setOptions(index, option);
+    painter->setFont(opt.font);
+
+    QItemDelegate::drawBackground(painter, opt, index);
+
+    // ---- do the layout
+    QRect checkRect;
+    QRect pixmapRect;
+    QRect textRect;
+
+    // check mark
+    const bool checkable = (index.model()->flags(index) & Qt::ItemIsUserCheckable);
+    Qt::CheckState checkState = Qt::Unchecked;
+    if (checkable) {
+        QVariant checkStateData = index.data(Qt::CheckStateRole);
+        checkState = static_cast<Qt::CheckState>(checkStateData.toInt());
+        checkRect = doCheck(opt, opt.rect, checkStateData);
+    }
+
+    // icon
+    const QIcon icon = index.model()->data(index, Qt::DecorationRole).value<QIcon>();
+    if (!icon.isNull()) {
+        const QSize size = icon.actualSize(QSize(iconSize, iconSize));
+        pixmapRect = QRect(0, 0, size.width(), size.height());
+    }
+
+    // text
+    textRect = opt.rect.adjusted(0, 0, checkRect.width() + pixmapRect.width(), 0);
+
+    // do layout
+    doLayout(opt, &checkRect, &pixmapRect, &textRect, false);
+    // ---- draw the items
+    // icon
+    if (!icon.isNull())
+        icon.paint(painter, pixmapRect, option.decorationAlignment);
+
+    // line numbers
+    const int lineNumberAreaWidth = drawLineNumber(painter, opt, textRect, index);
+    textRect.adjust(lineNumberAreaWidth, 0, 0, 0);
+
+    // text and focus/selection
+    drawText(painter, opt, textRect, index);
+    QItemDelegate::drawFocus(painter, opt, opt.rect);
+
+    // check mark
+    if (checkable)
+        QItemDelegate::drawCheck(painter, opt, checkRect, checkState);
+
+    painter->restore();
+}
+
+void HighlightingItemDelegate::setTabWidth(int width)
+{
+    m_tabString = QString(width, ' ');
+}
+
+// returns the width of the line number area
+int HighlightingItemDelegate::drawLineNumber(QPainter *painter, const QStyleOptionViewItem &option,
+                                             const QRect &rect,
+                                             const QModelIndex &index) const
+{
+    static const int lineNumberAreaHorizontalPadding = 4;
+    const int lineNumber = index.model()->data(index, int(HighlightingItemRole::LineNumber)).toInt();
+    if (lineNumber < 1)
+        return 0;
+    const bool isSelected = option.state & QStyle::State_Selected;
+    const QString lineText = QString::number(lineNumber);
+    const int minimumLineNumberDigits = qMax(kMinimumLineNumberDigits, lineText.count());
+    const int fontWidth = painter->fontMetrics().width(QString(minimumLineNumberDigits, '0'));
+    const int lineNumberAreaWidth = lineNumberAreaHorizontalPadding + fontWidth
+                                    + lineNumberAreaHorizontalPadding;
+    QRect lineNumberAreaRect(rect);
+    lineNumberAreaRect.setWidth(lineNumberAreaWidth);
+
+    QPalette::ColorGroup cg = QPalette::Normal;
+    if (!(option.state & QStyle::State_Active))
+        cg = QPalette::Inactive;
+    else if (!(option.state & QStyle::State_Enabled))
+        cg = QPalette::Disabled;
+
+    painter->fillRect(lineNumberAreaRect, QBrush(isSelected ?
+        option.palette.brush(cg, QPalette::Highlight) :
+        option.palette.color(cg, QPalette::Base).darker(111)));
+
+    QStyleOptionViewItem opt = option;
+    opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
+    opt.palette.setColor(cg, QPalette::Text, Qt::darkGray);
+
+    const QStyle *style = QApplication::style();
+    const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, 0) + 1;
+
+    const QRect rowRect
+            = lineNumberAreaRect.adjusted(-textMargin, 0,
+                                          textMargin - lineNumberAreaHorizontalPadding, 0);
+    QItemDelegate::drawDisplay(painter, opt, rowRect, lineText);
+
+    return lineNumberAreaWidth;
+}
+
+void HighlightingItemDelegate::drawText(QPainter *painter,
+                                        const QStyleOptionViewItem &option,
+                                        const QRect &rect,
+                                        const QModelIndex &index) const
+{
+    QString text = index.model()->data(index, Qt::DisplayRole).toString();
+    // show number of subresults in displayString
+    if (index.model()->hasChildren(index))
+        text += " (" + QString::number(index.model()->rowCount(index)) + ')';
+
+    int searchTermStart = index.model()->data(index, int(HighlightingItemRole::StartColumn)).toInt();
+    int searchTermLength = index.model()->data(index, int(HighlightingItemRole::Length)).toInt();
+    if (searchTermStart < 0 || searchTermStart >= text.length() || searchTermLength < 1) {
+        drawDisplay(painter, option, rect, text.replace('\t', m_tabString), {});
+        return;
+    }
+
+    // replace tabs with searchTerm bookkeeping
+    int searchTermEnd = searchTermStart + searchTermLength;
+    const int tabDiff = m_tabString.size() - 1;
+    for (int i = 0; i < text.length(); i++) {
+        if (text.at(i) == '\t') {
+            text.replace(i, 1, m_tabString);
+            if (i < searchTermStart) {
+                searchTermStart += tabDiff;
+                searchTermEnd += tabDiff;
+            } else if (i < searchTermEnd) {
+                searchTermEnd += tabDiff;
+                searchTermLength += tabDiff;
+            }
+            i += tabDiff;
+        }
+    }
+
+    const QColor highlightForeground =
+            index.model()->data(index, int(HighlightingItemRole::Foreground)).value<QColor>();
+    const QColor highlightBackground =
+            index.model()->data(index, int(HighlightingItemRole::Background)).value<QColor>();
+    QTextCharFormat highlightFormat;
+    highlightFormat.setForeground(highlightForeground);
+    highlightFormat.setBackground(highlightBackground);
+
+    drawDisplay(painter, option, rect, text, {{searchTermStart, searchTermLength, highlightFormat}});
+}
+
+// copied from QItemDelegate for drawDisplay
+static QString replaceNewLine(QString text)
+{
+    static const QChar nl = '\n';
+    for (int i = 0; i < text.count(); ++i)
+        if (text.at(i) == nl)
+            text[i] = QChar::LineSeparator;
+    return text;
+}
+
+// copied from QItemDelegate for drawDisplay
+QSizeF doTextLayout(QTextLayout *textLayout, int lineWidth)
+{
+    qreal height = 0;
+    qreal widthUsed = 0;
+    textLayout->beginLayout();
+    while (true) {
+        QTextLine line = textLayout->createLine();
+        if (!line.isValid())
+            break;
+        line.setLineWidth(lineWidth);
+        line.setPosition(QPointF(0, height));
+        height += line.height();
+        widthUsed = qMax(widthUsed, line.naturalTextWidth());
+    }
+    textLayout->endLayout();
+    return QSizeF(widthUsed, height);
+}
+
+// copied from QItemDelegate to be able to add the 'format' parameter
+void HighlightingItemDelegate::drawDisplay(QPainter *painter,
+                                           const QStyleOptionViewItem &option,
+                                           const QRect &rect, const QString &text,
+                                           const QVector<QTextLayout::FormatRange> &format) const
+{
+    QPalette::ColorGroup cg = option.state & QStyle::State_Enabled
+                              ? QPalette::Normal : QPalette::Disabled;
+    if (cg == QPalette::Normal && !(option.state & QStyle::State_Active))
+        cg = QPalette::Inactive;
+    if (option.state & QStyle::State_Selected) {
+        painter->fillRect(rect, option.palette.brush(cg, QPalette::Highlight));
+        painter->setPen(option.palette.color(cg, QPalette::HighlightedText));
+    } else {
+        painter->setPen(option.palette.color(cg, QPalette::Text));
+    }
+
+    if (text.isEmpty())
+        return;
+
+    if (option.state & QStyle::State_Editing) {
+        painter->save();
+        painter->setPen(option.palette.color(cg, QPalette::Text));
+        painter->drawRect(rect.adjusted(0, 0, -1, -1));
+        painter->restore();
+    }
+
+    const QStyleOptionViewItem opt = option;
+
+    const QWidget *widget = option.widget;
+    QStyle *style = widget ? widget->style() : QApplication::style();
+    const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, widget) + 1;
+    QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding
+    const bool wrapText = opt.features & QStyleOptionViewItem::WrapText;
+    QTextOption textOption;
+    textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::ManualWrap);
+    textOption.setTextDirection(option.direction);
+    textOption.setAlignment(QStyle::visualAlignment(option.direction, option.displayAlignment));
+    QTextLayout textLayout;
+    textLayout.setTextOption(textOption);
+    textLayout.setFont(option.font);
+    textLayout.setText(replaceNewLine(text));
+
+    QSizeF textLayoutSize = doTextLayout(&textLayout, textRect.width());
+
+    if (textRect.width() < textLayoutSize.width()
+        || textRect.height() < textLayoutSize.height()) {
+        QString elided;
+        int start = 0;
+        int end = text.indexOf(QChar::LineSeparator, start);
+        if (end == -1) {
+            elided += option.fontMetrics.elidedText(text, option.textElideMode, textRect.width());
+        } else {
+            while (end != -1) {
+                elided += option.fontMetrics.elidedText(text.mid(start, end - start),
+                                                        option.textElideMode, textRect.width());
+                elided += QChar::LineSeparator;
+                start = end + 1;
+                end = text.indexOf(QChar::LineSeparator, start);
+            }
+            // let's add the last line (after the last QChar::LineSeparator)
+            elided += option.fontMetrics.elidedText(text.mid(start),
+                                                    option.textElideMode, textRect.width());
+        }
+        textLayout.setText(elided);
+        textLayoutSize = doTextLayout(&textLayout, textRect.width());
+    }
+
+    const QSize layoutSize(textRect.width(), int(textLayoutSize.height()));
+    const QRect layoutRect = QStyle::alignedRect(option.direction, option.displayAlignment,
+                                                  layoutSize, textRect);
+    // if we still overflow even after eliding the text, enable clipping
+    if (!hasClipping() && (textRect.width() < textLayoutSize.width()
+                           || textRect.height() < textLayoutSize.height())) {
+        painter->save();
+        painter->setClipRect(layoutRect);
+        textLayout.draw(painter, layoutRect.topLeft(), format, layoutRect);
+        painter->restore();
+    } else {
+        textLayout.draw(painter, layoutRect.topLeft(), format, layoutRect);
+    }
+}
+
+} // namespace Utils
diff --git a/src/plugins/android/javacompletionassistprovider.h b/src/libs/utils/highlightingitemdelegate.h
index 277f5c45476..b9cfb617ddf 100644
--- a/src/plugins/android/javacompletionassistprovider.h
+++ b/src/libs/utils/highlightingitemdelegate.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
@@ -25,28 +25,37 @@
 
 #pragma once
 
-#include <texteditor/codeassist/completionassistprovider.h>
+#include "utils_global.h"
 
-#include <QStringList>
+#include <QItemDelegate>
+#include <QTextLayout>
 
-namespace Android {
-namespace Internal {
+namespace Utils {
 
-class JavaCompletionAssistProvider : public TextEditor::CompletionAssistProvider
-{
-    Q_OBJECT
+enum class HighlightingItemRole {
+    LineNumber = Qt::UserRole,
+    StartColumn,
+    Length,
+    Foreground,
+    Background,
+    User
+};
 
+class QTCREATOR_UTILS_EXPORT HighlightingItemDelegate : public QItemDelegate
+{
 public:
-    JavaCompletionAssistProvider();
-    ~JavaCompletionAssistProvider();
-
-    void init() const;
-
-    TextEditor::IAssistProcessor *createProcessor() const;
+    HighlightingItemDelegate(int tabWidth, QObject *parent = 0);
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    void setTabWidth(int width);
 
 private:
-    mutable QStringList m_keywords;
+    int drawLineNumber(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect, const QModelIndex &index) const;
+    void drawText(QPainter *painter, const QStyleOptionViewItem &option,
+                  const QRect &rect, const QModelIndex &index) const;
+    using QItemDelegate::drawDisplay;
+    void drawDisplay(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect,
+                     const QString &text, const QVector<QTextLayout::FormatRange> &format) const;
+    QString m_tabString;
 };
 
-} // namespace Internal
-} // namespace Android
+} // namespace Utils
diff --git a/src/libs/utils/icon.cpp b/src/libs/utils/icon.cpp
index e3a9a92ee89..f451d9697e2 100644
--- a/src/libs/utils/icon.cpp
+++ b/src/libs/utils/icon.cpp
@@ -36,6 +36,7 @@
 #include <QPainter>
 #include <QPaintEngine>
 #include <QWidget>
+#include <QDebug>
 
 namespace Utils {
 
@@ -67,7 +68,12 @@ static MasksAndColors masksAndColors(const Icon &icon, int dpr)
         const QColor color = creatorTheme()->color(i.second);
         const QString dprFileName = StyleHelper::availableImageResolutions(i.first).contains(dpr) ?
                     StyleHelper::imageFileWithResolution(fileName, dpr) : fileName;
-        result.append(qMakePair(QPixmap(dprFileName), color));
+        QPixmap pixmap;
+        if (!pixmap.load(dprFileName)) {
+            pixmap = QPixmap(1, 1);
+            qWarning() << "Could not load image: " << dprFileName;
+        }
+        result.append({pixmap, color});
     }
     return result;
 }
diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp
index b69bfe6f971..f2a13991cb2 100644
--- a/src/libs/utils/stringutils.cpp
+++ b/src/libs/utils/stringutils.cpp
@@ -28,8 +28,11 @@
 #include "hostosinfo.h"
 
 #include <utils/algorithm.h>
+#include <utils/qtcassert.h>
 
 #include <QDir>
+#include <QJsonArray>
+#include <QJsonValue>
 #include <QRegularExpression>
 #include <QSet>
 
@@ -246,4 +249,24 @@ QTCREATOR_UTILS_EXPORT QString stripAccelerator(const QString &text)
     return res;
 }
 
+QTCREATOR_UTILS_EXPORT bool readMultiLineString(const QJsonValue &value, QString *out)
+{
+    QTC_ASSERT(out, return false);
+    if (value.isString()) {
+        *out = value.toString();
+    } else if (value.isArray()) {
+        QJsonArray array = value.toArray();
+        QStringList lines;
+        foreach (const QJsonValue &v, array) {
+            if (!v.isString())
+                return false;
+            lines.append(v.toString());
+        }
+        *out = lines.join(QLatin1Char('\n'));
+    } else {
+        return false;
+    }
+    return true;
+}
+
 } // namespace Utils
diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h
index 8ff42bac6a4..0723e76656f 100644
--- a/src/libs/utils/stringutils.h
+++ b/src/libs/utils/stringutils.h
@@ -28,6 +28,7 @@
 #include "utils_global.h"
 
 QT_BEGIN_NAMESPACE
+class QJsonValue;
 class QStringList;
 QT_END_NAMESPACE
 
@@ -53,6 +54,8 @@ QTCREATOR_UTILS_EXPORT QString withTildeHomePath(const QString &path);
 // Removes first unescaped ampersand in text
 QTCREATOR_UTILS_EXPORT QString stripAccelerator(const QString &text);
 
+QTCREATOR_UTILS_EXPORT bool readMultiLineString(const QJsonValue &value, QString *out);
+
 class QTCREATOR_UTILS_EXPORT AbstractMacroExpander
 {
 public:
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index 3a6aa0a09af..578e0a8d5e4 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -113,7 +113,8 @@ SOURCES += $$PWD/environment.cpp \
     $$PWD/port.cpp \
     $$PWD/runextensions.cpp \
     $$PWD/utilsicons.cpp \
-    $$PWD/guard.cpp
+    $$PWD/guard.cpp \
+    $$PWD/highlightingitemdelegate.cpp
 
 win32:SOURCES += $$PWD/consoleprocess_win.cpp
 else:SOURCES += $$PWD/consoleprocess_unix.cpp
@@ -239,8 +240,9 @@ HEADERS += \
     $$PWD/asconst.h \
     $$PWD/smallstringfwd.h \
     $$PWD/optional.h \
+    $$PWD/../3rdparty/optional/optional.hpp \
     $$PWD/qtcfallthrough.h \
-    $$PWD/../3rdparty/optional/optional.hpp
+    $$PWD/highlightingitemdelegate.cpp
 
 FORMS += $$PWD/filewizardpage.ui \
     $$PWD/projectintropage.ui \
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 6d68683fdd5..0c0562acaf7 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -117,6 +117,8 @@ Project {
             "functiontraits.h",
             "guard.cpp",
             "guard.h",
+            "highlightingitemdelegate.cpp",
+            "highlightingitemdelegate.h",
             "historycompleter.cpp",
             "historycompleter.h",
             "hostosinfo.h",
diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
index d4bbcb95d39..67cc03f6ca4 100644
--- a/src/plugins/android/android.pro
+++ b/src/plugins/android/android.pro
@@ -41,7 +41,6 @@ HEADERS += \
     androidsignaloperation.h \
     javaeditor.h \
     javaindenter.h \
-    javacompletionassistprovider.h \
     avddialog.h \
     android_global.h \
     androidbuildapkstep.h \
@@ -86,7 +85,6 @@ SOURCES += \
     androidsignaloperation.cpp \
     javaeditor.cpp \
     javaindenter.cpp \
-    javacompletionassistprovider.cpp \
     avddialog.cpp \
     androidbuildapkstep.cpp \
     androidbuildapkwidget.cpp \
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index af7106439f3..4fccdaddcf8 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -107,8 +107,6 @@ Project {
             "avddialog.h",
             "certificatesmodel.cpp",
             "certificatesmodel.h",
-            "javacompletionassistprovider.cpp",
-            "javacompletionassistprovider.h",
             "javaeditor.cpp",
             "javaeditor.h",
             "javaindenter.cpp",
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index c73b73d4835..2af142e0d31 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -42,7 +42,6 @@
 #include "androidruncontrol.h"
 #include "androidsettingspage.h"
 #include "androidtoolchain.h"
-#include "javacompletionassistprovider.h"
 #include "javaeditor.h"
 
 #ifdef HAVE_QBS
diff --git a/src/plugins/android/androidrunconfigurationwidget.ui b/src/plugins/android/androidrunconfigurationwidget.ui
index 5cfee96dc89..c028aeaa803 100644
--- a/src/plugins/android/androidrunconfigurationwidget.ui
+++ b/src/plugins/android/androidrunconfigurationwidget.ui
@@ -78,7 +78,7 @@
    <item row="2" column="2">
     <widget class="QLabel" name="label_3">
      <property name="text">
-      <string>Conflicting "am start" options might result in the app startup failure.</string>
+      <string>If the "am start" options conflict, the application might not start.</string>
      </property>
     </widget>
    </item>
diff --git a/src/plugins/android/javacompletionassistprovider.cpp b/src/plugins/android/javacompletionassistprovider.cpp
deleted file mode 100644
index a237c570add..00000000000
--- a/src/plugins/android/javacompletionassistprovider.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "javacompletionassistprovider.h"
-#include "androidconstants.h"
-
-#include <texteditor/codeassist/assistinterface.h>
-#include <texteditor/codeassist/keywordscompletionassist.h>
-#include <coreplugin/id.h>
-
-using namespace Android;
-using namespace Android::Internal;
-
-static const char *const keywords[] = {
-    "abstract",
-    "continue",
-    "for",
-    "new",
-    "switch",
-    "assert",
-    "default",
-    "goto",
-    "package",
-    "synchronized",
-    "boolean",
-    "do",
-    "if",
-    "private",
-    "this",
-    "break",
-    "double",
-    "implements",
-    "protected",
-    "throw",
-    "byte",
-    "else",
-    "import",
-    "public",
-    "throws",
-    "case",
-    "enum",
-    "instanceof",
-    "return",
-    "transient",
-    "catch",
-    "extends",
-    "int",
-    "short",
-    "try",
-    "char",
-    "final",
-    "interface",
-    "static",
-    "void",
-    "class",
-    "finally",
-    "long",
-    "strictfp",
-    "volatile",
-    "const",
-    "float",
-    "native",
-    "super",
-    "while",
-    0
-};
-
-JavaCompletionAssistProvider::JavaCompletionAssistProvider()
-{
-}
-
-JavaCompletionAssistProvider::~JavaCompletionAssistProvider()
-{
-
-}
-
-void JavaCompletionAssistProvider::init() const
-{
-    for (uint i = 0; i < sizeof keywords / sizeof keywords[0] - 1; i++)
-        m_keywords.append(QLatin1String(keywords[i]));
-}
-
-TextEditor::IAssistProcessor *JavaCompletionAssistProvider::createProcessor() const
-{
-    if (m_keywords.isEmpty())
-        init();
-    TextEditor::Keywords keywords = TextEditor::Keywords(m_keywords,
-                                                         QStringList(),
-                                                         QMap<QString, QStringList>());
-    return new TextEditor::KeywordsCompletionAssistProcessor(keywords);
-}
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index 6cddfa95a6a..81c3112219f 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -26,8 +26,8 @@
 #include "javaeditor.h"
 #include "javaindenter.h"
 #include "androidconstants.h"
-#include "javacompletionassistprovider.h"
 
+#include <texteditor/codeassist/keywordscompletionassist.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
 #include <texteditor/normalindenter.h>
 #include <texteditor/textdocument.h>
@@ -59,6 +59,14 @@ static TextEditor::TextDocument *createJavaDocument()
 
 JavaEditorFactory::JavaEditorFactory()
 {
+    static QStringList keywords = {
+        "abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", "class", "const",
+        "continue", "default", "do", "double", "else", "enum", "extends", "final", "finally",
+        "float", "for", "goto", "if", "implements", "import", "instanceof", "int", "interface",
+        "long", "native", "new", "package", "private", "protected", "public", "return", "short",
+        "static", "strictfp", "super", "switch", "synchronized", "this", "throw", "throws",
+        "transient", "try", "void", "volatile", "while"
+    };
     setId(Constants::JAVA_EDITOR_ID);
     setDisplayName(tr("Java Editor"));
     addMimeType(Constants::JAVA_MIMETYPE);
@@ -67,8 +75,8 @@ JavaEditorFactory::JavaEditorFactory()
     setUseGenericHighlighter(true);
     setCommentDefinition(Utils::CommentDefinition::CppStyle);
     setEditorActionHandlers(TextEditor::TextEditorActionHandler::UnCommentSelection);
-    setCompletionAssistProvider(new JavaCompletionAssistProvider);
     setMarksVisible(true);
+    setCompletionAssistProvider(new TextEditor::KeywordsCompletionAssistProvider(keywords));
 }
 
 } // namespace Internal
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 6b0f995ecea..e29f72ae9ef 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -47,6 +47,7 @@
 #include <cpptools/editordocumenthandle.h>
 
 #include <texteditor/convenience.h>
+#include <texteditor/displaysettings.h>
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditor.h>
 #include <texteditor/texteditorconstants.h>
@@ -274,6 +275,9 @@ void ClangEditorDocumentProcessor::addDiagnosticToolTipToLayout(uint line,
         = m_diagnosticManager.diagnosticsAt(line, column);
 
     target->addWidget(ClangDiagnosticWidget::create(diagnostics, ClangDiagnosticWidget::ToolTip));
+    auto link = TextEditor::DisplaySettings::createAnnotationSettingsLink();
+    target->addWidget(link);
+    target->setAlignment(link, Qt::AlignRight);
 }
 
 void ClangEditorDocumentProcessor::editorDocumentTimerRestarted()
diff --git a/src/plugins/clearcase/versionselector.cpp b/src/plugins/clearcase/versionselector.cpp
index 70f920cf73f..42067fd0417 100644
--- a/src/plugins/clearcase/versionselector.cpp
+++ b/src/plugins/clearcase/versionselector.cpp
@@ -39,7 +39,7 @@ VersionSelector::VersionSelector(const QString &fileName, const QString &message
 {
     ui->setupUi(this);
     ui->headerLabel->setText(ui->headerLabel->text().arg(fileName));
-    ui->loadedText->setHtml(tr("<html><head/><body><p><b>NOTE: You will not be able to check in "
+    ui->loadedText->setHtml(tr("<html><head/><body><p><b>Note: You will not be able to check in "
                                "this file without merging the changes (not supported by the "
                                "plugin)</b></p></body></html>"));
     m_stream = new QTextStream(message.toLocal8Bit(), QIODevice::ReadOnly | QIODevice::Text);
diff --git a/src/plugins/clearcase/versionselector.ui b/src/plugins/clearcase/versionselector.ui
index d69b901d3cf..7e1c9b620bc 100644
--- a/src/plugins/clearcase/versionselector.ui
+++ b/src/plugins/clearcase/versionselector.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
-      <string>There are multiple versions of '%1' which can be considered for checkout. Please select version to checkout:</string>
+      <string>Multiple versions of "%1" can be checked out. Select the version to check out:</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -32,7 +32,7 @@
      <item row="0" column="0">
       <widget class="QRadioButton" name="loadedRadioButton">
        <property name="text">
-        <string>&amp;Loaded Version</string>
+        <string>&amp;Loaded version</string>
        </property>
        <property name="checked">
         <bool>true</bool>
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index a51d418a6c7..c005b90eaa9 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -132,7 +132,7 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
         const QJsonObject metaData = plugin->metaData();
         const QJsonValue mimetypes = metaData.value("Mimetypes");
         QString mimetypeString;
-        if (ExtensionSystem::PluginSpec::readMultiLineString(mimetypes, &mimetypeString))
+        if (Utils::readMultiLineString(mimetypes, &mimetypeString))
             Utils::addMimeTypes(plugin->name() + ".mimetypes", mimetypeString.trimmed().toUtf8());
     }
 
diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp
index b09fc6e8fd9..9eee8dee632 100644
--- a/src/plugins/coreplugin/find/searchresultwidget.cpp
+++ b/src/plugins/coreplugin/find/searchresultwidget.cpp
@@ -79,12 +79,7 @@ public:
 };
 
 SearchResultWidget::SearchResultWidget(QWidget *parent) :
-    QWidget(parent),
-    m_count(0),
-    m_preserveCaseSupported(true),
-    m_isShowingReplaceUI(false),
-    m_searchAgainSupported(false),
-    m_replaceSupported(false)
+    QWidget(parent)
 {
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setMargin(0);
@@ -295,8 +290,6 @@ void SearchResultWidget::addResults(const QList<SearchResultItem> &items, Search
     }
 }
 
-
-
 int SearchResultWidget::count() const
 {
     return m_count;
@@ -309,7 +302,6 @@ void SearchResultWidget::setSupportsReplace(bool replaceSupported, const QString
     m_dontAskAgainGroup = group;
 }
 
-
 void SearchResultWidget::setTextToReplace(const QString &textToReplace)
 {
     m_replaceTextEdit->setText(textToReplace);
diff --git a/src/plugins/coreplugin/find/searchresultwidget.h b/src/plugins/coreplugin/find/searchresultwidget.h
index 5c5e3374a6f..5309ed69e1e 100644
--- a/src/plugins/coreplugin/find/searchresultwidget.h
+++ b/src/plugins/coreplugin/find/searchresultwidget.h
@@ -119,28 +119,28 @@ private:
     QList<SearchResultItem> checkedItems() const;
     void updateMatchesFoundLabel();
 
-    SearchResultTreeView *m_searchResultTreeView;
-    int m_count;
+    SearchResultTreeView *m_searchResultTreeView = nullptr;
+    int m_count = 0;
     QString m_dontAskAgainGroup;
-    QFrame *m_messageWidget;
+    QFrame *m_messageWidget = nullptr;
     InfoBar m_infoBar;
     InfoBarDisplay m_infoBarDisplay;
-    QWidget *m_topReplaceWidget;
-    QLabel *m_replaceLabel;
-    QLineEdit *m_replaceTextEdit;
-    QToolButton *m_replaceButton;
-    QToolButton *m_searchAgainButton;
-    QCheckBox *m_preserveCaseCheck;
+    QWidget *m_topReplaceWidget = nullptr;
+    QLabel *m_replaceLabel = nullptr;
+    QLineEdit *m_replaceTextEdit = nullptr;
+    QToolButton *m_replaceButton = nullptr;
+    QToolButton *m_searchAgainButton = nullptr;
+    QCheckBox *m_preserveCaseCheck = nullptr;
     QCheckBox *m_renameFilesCheckBox = nullptr;
-    QWidget *m_descriptionContainer;
-    QLabel *m_label;
-    QLabel *m_searchTerm;
-    QToolButton *m_cancelButton;
-    QLabel *m_matchesFoundLabel;
-    bool m_preserveCaseSupported;
-    bool m_isShowingReplaceUI;
-    bool m_searchAgainSupported;
-    bool m_replaceSupported;
+    QWidget *m_descriptionContainer = nullptr;
+    QLabel *m_label = nullptr;
+    QLabel *m_searchTerm = nullptr;
+    QToolButton *m_cancelButton = nullptr;
+    QLabel *m_matchesFoundLabel = nullptr;
+    bool m_preserveCaseSupported = true;
+    bool m_isShowingReplaceUI = false;
+    bool m_searchAgainSupported = false;
+    bool m_replaceSupported = false;
 };
 
 } // Internal
diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index 3c09e0a32f4..63abc858fc5 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -33,14 +33,13 @@
 #include <coreplugin/modemanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/fileiconprovider.h>
-#include <coreplugin/find/searchresulttreeitemdelegate.h>
-#include <coreplugin/find/searchresulttreeitemroles.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/mainwindow.h>
 #include <utils/algorithm.h>
 #include <utils/appmainwindow.h>
 #include <utils/asconst.h>
 #include <utils/fancylineedit.h>
+#include <utils/highlightingitemdelegate.h>
 #include <utils/hostosinfo.h>
 #include <utils/itemviews.h>
 #include <utils/progressindicator.h>
@@ -67,6 +66,10 @@
 
 Q_DECLARE_METATYPE(Core::LocatorFilterEntry)
 
+using namespace Utils;
+
+const int LocatorEntryRole = int(HighlightingItemRole::User);
+
 namespace Core {
 namespace Internal {
 
@@ -99,7 +102,7 @@ private:
     QColor mBackgroundColor;
 };
 
-class CompletionDelegate : public SearchResultTreeItemDelegate
+class CompletionDelegate : public HighlightingItemDelegate
 {
 public:
     CompletionDelegate(QObject *parent);
@@ -193,7 +196,6 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const
                             + QLatin1String("\n\n") + mEntries.at(index.row()).extraInfo);
         break;
     case Qt::DecorationRole:
-    case ItemDataRoles::ResultIconRole:
         if (index.column() == DisplayNameColumn) {
             LocatorFilterEntry &entry = mEntries[index.row()];
             if (!entry.displayIcon && !entry.fileName.isEmpty())
@@ -205,21 +207,21 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const
         if (index.column() == ExtraInfoColumn)
             return QColor(Qt::darkGray);
         break;
-    case ItemDataRoles::ResultItemRole:
+    case LocatorEntryRole:
         return qVariantFromValue(mEntries.at(index.row()));
-    case ItemDataRoles::ResultBeginColumnNumberRole:
-    case ItemDataRoles::SearchTermLengthRole: {
+    case int(HighlightingItemRole::StartColumn):
+    case int(HighlightingItemRole::Length): {
         LocatorFilterEntry &entry = mEntries[index.row()];
         const int highlightColumn = entry.highlightInfo.dataType == LocatorFilterEntry::HighlightInfo::DisplayName
                                                                  ? DisplayNameColumn
                                                                  : ExtraInfoColumn;
         if (highlightColumn == index.column()) {
-            const bool startIndexRole = role == ItemDataRoles::ResultBeginColumnNumberRole;
+            const bool startIndexRole = role == int(HighlightingItemRole::StartColumn);
             return startIndexRole ? entry.highlightInfo.startIndex : entry.highlightInfo.length;
         }
         break;
     }
-    case ItemDataRoles::ResultHighlightBackgroundColor:
+    case int(HighlightingItemRole::Background):
         return mBackgroundColor;
     }
 
@@ -843,7 +845,7 @@ void LocatorWidget::acceptEntry(int row)
     const QModelIndex index = m_locatorModel->index(row, 0);
     if (!index.isValid())
         return;
-    const LocatorFilterEntry entry = m_locatorModel->data(index, ItemDataRoles::ResultItemRole).value<LocatorFilterEntry>();
+    const LocatorFilterEntry entry = m_locatorModel->data(index, LocatorEntryRole).value<LocatorFilterEntry>();
     Q_ASSERT(entry.filter != nullptr);
     QString newText;
     int selectionStart = -1;
@@ -926,13 +928,13 @@ LocatorPopup *createLocatorPopup(Locator *locator, QWidget *parent)
 }
 
 CompletionDelegate::CompletionDelegate(QObject *parent)
-    : SearchResultTreeItemDelegate(0, parent)
+    : HighlightingItemDelegate(0, parent)
 {
 }
 
 QSize CompletionDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    return SearchResultTreeItemDelegate::sizeHint(option, index) + QSize(0, 2);
+    return HighlightingItemDelegate::sizeHint(option, index) + QSize(0, 2);
 }
 
 } // namespace Internal
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 61d9feb63df..ff9c6cc5810 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -312,6 +312,15 @@ void NavigationWidget::resizeEvent(QResizeEvent *re)
     MiniSplitter::resizeEvent(re);
 }
 
+static QIcon closeIconForSide(Side side, int itemCount)
+{
+    if (itemCount > 1)
+        return Utils::Icons::CLOSE_SPLIT_TOP.icon();
+    return side == Side::Left
+            ? Utils::Icons::CLOSE_SPLIT_LEFT.icon()
+            : Utils::Icons::CLOSE_SPLIT_RIGHT.icon();
+}
+
 Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position, int factoryIndex)
 {
     for (int pos = position + 1; pos < d->m_subWidgets.size(); ++pos) {
@@ -331,9 +340,7 @@ Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position, int
     insertWidget(position, nsw);
 
     d->m_subWidgets.insert(position, nsw);
-    d->m_subWidgets.at(0)->setCloseIcon(d->m_subWidgets.size() == 1
-                                        ? Utils::Icons::CLOSE_SPLIT_LEFT.icon()
-                                        : Utils::Icons::CLOSE_SPLIT_TOP.icon());
+    d->m_subWidgets.at(0)->setCloseIcon(closeIconForSide(d->m_side, d->m_subWidgets.size()));
     NavigationWidgetPrivate::updateActivationsMap(nsw->factory()->id(), {d->m_side, position});
     return nsw;
 }
@@ -386,10 +393,8 @@ void NavigationWidget::closeSubWidget()
         subWidget->hide();
         subWidget->deleteLater();
         // update close button of top item
-        if (d->m_subWidgets.size() == 1)
-            d->m_subWidgets.at(0)->setCloseIcon(d->m_subWidgets.size() == 1
-                                                ? Utils::Icons::CLOSE_SPLIT_LEFT.icon()
-                                                : Utils::Icons::CLOSE_SPLIT_TOP.icon());
+        if (!d->m_subWidgets.isEmpty())
+            d->m_subWidgets.at(0)->setCloseIcon(closeIconForSide(d->m_side, d->m_subWidgets.size()));
     } else {
         setShown(false);
     }
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 32cace3e149..c069b3514e7 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -25,6 +25,7 @@
 
 #include "cppfindreferences.h"
 
+#include "cppfilesettingspage.h"
 #include "cpptoolsconstants.h"
 #include "cppmodelmanager.h"
 #include "cppworkingcopy.h"
@@ -384,6 +385,11 @@ void CppFindReferences::findAll_helper(SearchResult *search, Symbol *symbol,
     connect(progress, &FutureProgress::clicked, search, &SearchResult::popup);
 }
 
+static bool isAllLowerCase(const QString &text)
+{
+    return text.toLower() == text;
+}
+
 void CppFindReferences::onReplaceButtonClicked(const QString &text,
                                                const QList<SearchResultItem> &items,
                                                bool preserveCase)
@@ -405,21 +411,40 @@ void CppFindReferences::onReplaceButtonClicked(const QString &text,
     if (!renameFilesCheckBox || !renameFilesCheckBox->isChecked())
         return;
 
+    CppFileSettings settings;
+    settings.fromSettings(Core::ICore::settings());
+
     const QStringList newPaths =
             Utils::transform<QList>(parameters.filesToRename,
-                                    [&parameters, text](const Node *node) -> QString {
+                                    [&parameters, text, &settings](const Node *node) -> QString {
         const QFileInfo fi = node->filePath().toFileInfo();
-        const QString fileName = fi.fileName();
-        QString newName = fileName;
-        newName.replace(parameters.prettySymbolName, text, Qt::CaseInsensitive);
-
-        if (newName != fileName) {
-            newName = Utils::matchCaseReplacement(fileName, newName);
-
-            return fi.absolutePath() + "/" + newName;
+        const QString oldSymbolName = parameters.prettySymbolName;
+        const QString oldBaseName = fi.baseName();
+        const QString newSymbolName = text;
+        QString newBaseName = newSymbolName;
+
+        // 1) new symbol lowercase: new base name lowercase
+        if (isAllLowerCase(newSymbolName)) {
+            newBaseName = newSymbolName;
+
+        // 2) old base name mixed case: new base name is verbatim symbol name
+        } else if (!isAllLowerCase(oldBaseName)) {
+            newBaseName = newSymbolName;
+
+        // 3) old base name lowercase, old symbol mixed case: new base name lowercase
+        } else if (!isAllLowerCase(oldSymbolName)) {
+            newBaseName = newSymbolName.toLower();
+
+        // 4) old base name lowercase, old symbol lowercase, new symbol mixed case:
+        //    use the preferences setting for new base name case
+        } else if (settings.lowerCaseFiles) {
+            newBaseName = newSymbolName.toLower();
         }
 
-        return QString();
+        if (newBaseName == oldBaseName)
+            return QString();
+
+        return fi.absolutePath() + "/" + newBaseName + '.' + fi.completeSuffix();
     });
 
     for (int i = 0; i < parameters.filesToRename.size(); ++i) {
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index efc1680458e..543ad8f8190 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -2030,7 +2030,11 @@ void DebuggerEngine::checkState(DebuggerState state, const char *file, int line)
 
 bool DebuggerEngine::isNativeMixedEnabled() const
 {
-    return runParameters().nativeMixedEnabled && (runParameters().languages & QmlLanguage);
+    if (DebuggerRunTool *rt = runTool()) {
+        const DebuggerRunParameters &runParams = rt->runParameters();
+        return runParams.nativeMixedEnabled && (runParams.languages & QmlLanguage);
+    }
+    return false;
 }
 
 bool DebuggerEngine::isNativeMixedActive() const
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 580749f2f16..fd3f8892f3d 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4034,7 +4034,10 @@ void GdbEngine::reloadDebuggingHelpers()
 
 void GdbEngine::handleGdbError(QProcess::ProcessError error)
 {
-    QString program = runParameters().debugger.executable;
+    QString program;
+    // avoid accessing invalid memory if the process crashed
+    if (runTool())
+        program = runParameters().debugger.executable;
     QString msg = RunWorker::userMessageForProcessError(error, program);
     QString errorString = m_gdbProc.errorString();
     if (!errorString.isEmpty())
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 74fd2ba37d8..ae1c324c304 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1065,7 +1065,7 @@ bool GitClient::synchronousReset(const QString &workingDirectory,
         if (files.isEmpty()) {
             msgCannotRun(arguments, workingDirectory, resp.stdErr(), errorMessage);
         } else {
-            msgCannotRun(tr("Cannot reset %n file(s) in \"%1\": %2", 0, files.size())
+            msgCannotRun(tr("Cannot reset %n files in \"%1\": %2", 0, files.size())
                          .arg(QDir::toNativeSeparators(workingDirectory), resp.stdErr()),
                          errorMessage);
         }
@@ -2468,9 +2468,9 @@ bool GitClient::getCommitData(const QString &workingDirectory,
 static inline QString msgCommitted(const QString &amendSHA1, int fileCount)
 {
     if (amendSHA1.isEmpty())
-        return GitClient::tr("Committed %n file(s).", 0, fileCount) + '\n';
+        return GitClient::tr("Committed %n files.", 0, fileCount) + '\n';
     if (fileCount)
-        return GitClient::tr("Amended \"%1\" (%n file(s)).", 0, fileCount).arg(amendSHA1) + '\n';
+        return GitClient::tr("Amended \"%1\" (%n files).", 0, fileCount).arg(amendSHA1) + '\n';
     return GitClient::tr("Amended \"%1\".").arg(amendSHA1);
 }
 
@@ -2561,7 +2561,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
         VcsOutputWindow::appendError(stdErr);
         return true;
     } else {
-        VcsOutputWindow::appendError(tr("Cannot commit %n file(s): %1\n", 0, commitCount).arg(stdErr));
+        VcsOutputWindow::appendError(tr("Cannot commit %n files: %1\n", 0, commitCount).arg(stdErr));
         return false;
     }
 }
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index df286c0fee7..311127aaa7e 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -716,9 +716,11 @@ void GitPlugin::blameFile()
             cursor.setPosition(selectionStart);
             const int startBlock = cursor.blockNumber();
             cursor.setPosition(selectionEnd);
-            const int endBlock = cursor.blockNumber();
+            int endBlock = cursor.blockNumber();
             if (startBlock != endBlock) {
                 firstLine = startBlock + 1;
+                if (cursor.atBlockStart())
+                    --endBlock;
                 if (auto widget = qobject_cast<VcsBaseEditorWidget *>(textEditor->widget())) {
                     const int previousFirstLine = widget->firstLineNumber();
                     if (previousFirstLine > 0)
diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp
index 0428ee9c83d..e808f1b9d11 100644
--- a/src/plugins/help/helpindexfilter.cpp
+++ b/src/plugins/help/helpindexfilter.cpp
@@ -145,11 +145,7 @@ void HelpIndexFilter::accept(LocatorFilterEntry selection,
     Q_UNUSED(selectionLength)
     const QString &key = selection.displayName;
     const QMap<QString, QUrl> &links = HelpManager::linksForKeyword(key);
-
-    if (links.size() == 1)
-        emit linkActivated(links.begin().value());
-    else
-        emit linksActivated(links, key);
+    emit linksActivated(links, key);
 }
 
 void HelpIndexFilter::refresh(QFutureInterface<void> &future)
diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h
index 1cf1f412975..b8e321cbcb3 100644
--- a/src/plugins/help/helpindexfilter.h
+++ b/src/plugins/help/helpindexfilter.h
@@ -52,7 +52,6 @@ public:
     Q_INVOKABLE QSet<QString> searchMatches(const QString &databaseFilePath,
                                           const QString &term, int limit);
 signals:
-    void linkActivated(const QUrl &link) const;
     void linksActivated(const QMap<QString, QUrl> &links, const QString &key) const;
 
 private:
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index ef03175df61..39fe63a376e 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -236,10 +236,8 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
 
     auto helpIndexFilter = new HelpIndexFilter();
     addAutoReleasedObject(helpIndexFilter);
-    connect(helpIndexFilter, &HelpIndexFilter::linkActivated,
-            this, &HelpPlugin::showLinkInHelpMode);
     connect(helpIndexFilter, &HelpIndexFilter::linksActivated,
-            this, &HelpPlugin::showLinksInHelpMode);
+            this, &HelpPlugin::showLinksInCurrentViewer);
 
     RemoteHelpFilter *remoteHelpFilter = new RemoteHelpFilter();
     addAutoReleasedObject(remoteHelpFilter);
@@ -430,11 +428,12 @@ void HelpPlugin::showLinkInHelpMode(const QUrl &source)
     showInHelpViewer(source, helpModeHelpViewer());
 }
 
-void HelpPlugin::showLinksInHelpMode(const QMap<QString, QUrl> &links, const QString &key)
+void HelpPlugin::showLinksInCurrentViewer(const QMap<QString, QUrl> &links, const QString &key)
 {
-    activateHelpMode();
-    ICore::raiseWindow(m_mode->widget());
-    m_centralWidget->showTopicChooser(links, key);
+    if (links.size() < 1)
+        return;
+    HelpWidget *widget = helpWidgetForWindow(QApplication::activeWindow());
+    widget->showLinks(links, key);
 }
 
 void HelpPlugin::slotHideRightPane()
@@ -499,6 +498,14 @@ HelpViewer *HelpPlugin::helpModeHelpViewer()
     return viewer;
 }
 
+HelpWidget *HelpPlugin::helpWidgetForWindow(QWidget *window)
+{
+    if (m_externalWindow && m_externalWindow->window() == window->window())
+        return m_externalWindow;
+    activateHelpMode();
+    return m_centralWidget;
+}
+
 HelpViewer *HelpPlugin::viewerForHelpViewerLocation(HelpManager::HelpViewerLocation location)
 {
     HelpManager::HelpViewerLocation actualLocation = location;
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 4e02e5d3fb8..d6985733efb 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -89,7 +89,7 @@ private:
 
     void saveExternalWindowSettings();
     void showLinkInHelpMode(const QUrl &source);
-    void showLinksInHelpMode(const QMap<QString, QUrl> &links, const QString &key);
+    void showLinksInCurrentViewer(const QMap<QString, QUrl> &links, const QString &key);
     void slotHideRightPane();
 
     void updateSideBarSource(const QUrl &newUrl);
@@ -109,6 +109,7 @@ private:
     void createRightPaneContextViewer();
     HelpViewer *externalHelpViewer();
     HelpViewer *helpModeHelpViewer();
+    HelpWidget *helpWidgetForWindow(QWidget *window);
 
     void doSetupIfNeeded();
 
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index 207661cec60..b0e6cb3daf7 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -354,10 +354,8 @@ void HelpWidget::addSideBar()
     auto indexItem = new Core::SideBarItem(indexWindow, Constants::HELP_INDEX);
     indexWindow->setOpenInNewPageActionVisible(supportsNewPages);
     indexWindow->setWindowTitle(HelpPlugin::tr(Constants::SB_INDEX));
-    connect(indexWindow, &IndexWindow::linkActivated,
-            this, &HelpWidget::open);
     connect(indexWindow, &IndexWindow::linksActivated,
-        this, &HelpWidget::showTopicChooser);
+        this, &HelpWidget::showLinks);
     m_indexAction = new QAction(HelpPlugin::tr(Constants::SB_INDEX), this);
     cmd = Core::ActionManager::registerAction(m_indexAction, Constants::HELP_INDEX, m_context->context());
     cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+I")
@@ -535,12 +533,18 @@ void HelpWidget::open(const QUrl &url, bool newPage)
         setSource(url);
 }
 
-void HelpWidget::showTopicChooser(const QMap<QString, QUrl> &links,
+void HelpWidget::showLinks(const QMap<QString, QUrl> &links,
     const QString &keyword, bool newPage)
 {
-    TopicChooser tc(this, keyword, links);
-    if (tc.exec() == QDialog::Accepted)
-        open(tc.link(), newPage);
+    if (links.size() < 1)
+        return;
+    if (links.size() == 1) {
+        open(links.first(), newPage);
+    } else {
+        TopicChooser tc(this, keyword, links);
+        if (tc.exec() == QDialog::Accepted)
+            open(tc.link(), newPage);
+    }
 }
 
 void HelpWidget::activateSideBarItem(const QString &id)
diff --git a/src/plugins/help/helpwidget.h b/src/plugins/help/helpwidget.h
index 5fa1ad1faab..3e27d28619c 100644
--- a/src/plugins/help/helpwidget.h
+++ b/src/plugins/help/helpwidget.h
@@ -74,7 +74,7 @@ public:
 
     void open(const QUrl &url, bool newPage = false);
     void openFromSearch(const QUrl &url, const QStringList &searchTerms, bool newPage = false);
-    void showTopicChooser(const QMap<QString, QUrl> &links, const QString &key,
+    void showLinks(const QMap<QString, QUrl> &links, const QString &key,
                           bool newPage = false);
     void activateSideBarItem(const QString &id);
 
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index 3881b78a579..68680911154 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -289,7 +289,10 @@ void IosConfigurations::updateAutomaticKitList()
                 continue;
             }
             Core::Id pDeviceType = deviceId(sdk.directoryName);
-            QTC_ASSERT(pDeviceType.isValid(), continue);
+            if (!pDeviceType.isValid()) {
+                qCDebug(kitSetupLog) << "Unsupported/Invalid device type" << sdk.directoryName;
+                continue;
+            }
 
             for (BaseQtVersion *qtVersion : qtVersions) {
                 qCDebug(kitSetupLog) << "  - Qt version:" << qtVersion->displayName();
diff --git a/src/plugins/ios/iossettingswidget.cpp b/src/plugins/ios/iossettingswidget.cpp
index 8e3ff464e7b..0afe270775d 100644
--- a/src/plugins/ios/iossettingswidget.cpp
+++ b/src/plugins/ios/iossettingswidget.cpp
@@ -125,7 +125,7 @@ void IosSettingsWidget::onStart()
     QList<QFuture<void>> futureList;
     foreach (const SimulatorInfo &info, simulatorInfoList) {
         if (!info.isShutdown()) {
-            statusDialog->addMessage(tr("Cannot start simulator(%1, %2) in current state: %3")
+            statusDialog->addMessage(tr("Cannot start simulator (%1, %2) in current state: %3")
                                     .arg(info.name).arg(info.runtimeName).arg(info.state),
                                     Utils::StdErrFormat);
         } else {
@@ -151,10 +151,10 @@ void IosSettingsWidget::onCreate()
     const auto onSimulatorCreate = [this, statusDialog](const QString &name,
             const SimulatorControl::ResponseData &response) {
         if (response.success) {
-            statusDialog->addMessage(tr("Simulator device(%1) created.\nUDID: %2")
+            statusDialog->addMessage(tr("Simulator device (%1) created.\nUDID: %2")
                                     .arg(name).arg(response.simUdid), Utils::StdOutFormat);
         } else {
-            statusDialog->addMessage(tr("Simulator device(%1) creation failed.\nError: %2").
+            statusDialog->addMessage(tr("Simulator device (%1) creation failed.\nError: %2").
                                     arg(name).arg(QString::fromUtf8(response.commandOutput)),
                                     Utils::StdErrFormat);
         }
@@ -218,6 +218,8 @@ void IosSettingsWidget::onRename()
     const SimulatorInfo &simInfo = simulatorInfoList.at(0);
     const QString newName = QInputDialog::getText(this, tr("Rename %1").arg(simInfo.name),
                                             tr("Enter new name:"));
+    if (newName.isEmpty())
+        return;
 
     QPointer<SimulatorOperationDialog> statusDialog = new SimulatorOperationDialog(this);
     statusDialog->setAttribute(Qt::WA_DeleteOnClose);
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index 317c1f6f594..1e85d8fcbd4 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -396,7 +396,7 @@ void IosToolHandlerPrivate::toolExited(int code)
 void IosDeviceToolHandlerPrivate::subprocessError(QProcess::ProcessError error)
 {
     if (state != Stopped)
-        errorMsg(IosToolHandler::tr("iOS tool Error %1").arg(error));
+        errorMsg(IosToolHandler::tr("iOS tool error %1").arg(error));
     stop(-1);
     if (error == QProcess::FailedToStart) {
         qCDebug(toolHandlerLog) << "IosToolHandler::finished(" << this << ")";
@@ -837,7 +837,7 @@ void IosSimulatorToolHandlerPrivate::requestTransferApp(const QString &appBundle
         if (response.success) {
             installAppOnSimulator();
         } else {
-            errorMsg(IosToolHandler::tr("Application install on Simulator failed. Simulator not running."));
+            errorMsg(IosToolHandler::tr("Application install on simulator failed. Simulator not running."));
             didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Failure);
             emit q->finished(q);
         }
@@ -862,7 +862,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
 
     Utils::FileName appBundle = Utils::FileName::fromString(m_bundlePath);
     if (!appBundle.exists()) {
-        errorMsg(IosToolHandler::tr("Application launch on Simulator failed. Invalid Bundle path %1")
+        errorMsg(IosToolHandler::tr("Application launch on simulator failed. Invalid bundle path %1")
                  .arg(m_bundlePath));
         didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure);
         return;
@@ -874,7 +874,7 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
         if (response.success) {
             launchAppOnSimulator(extraArgs);
         } else {
-            errorMsg(IosToolHandler::tr("Application launch on Simulator failed. Simulator not running."));
+            errorMsg(IosToolHandler::tr("Application launch on simulator failed. Simulator not running."));
             didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure);
         }
     };
@@ -926,7 +926,7 @@ void IosSimulatorToolHandlerPrivate::installAppOnSimulator()
             isTransferringApp(m_bundlePath, m_deviceId, 100, 100, "");
             didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Success);
         } else {
-            errorMsg(IosToolHandler::tr("Application install on Simulator failed. %1")
+            errorMsg(IosToolHandler::tr("Application install on simulator failed. %1")
                      .arg(QString::fromLocal8Bit(response.commandOutput)));
             didTransferApp(m_bundlePath, m_deviceId, IosToolHandler::Failure);
         }
@@ -990,7 +990,7 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
                                               stderrFile);
         } else {
             m_pid = -1;
-            errorMsg(IosToolHandler::tr("Application launch on Simulator failed. %1")
+            errorMsg(IosToolHandler::tr("Application launch on simulator failed. %1")
                      .arg(QString::fromLocal8Bit(response.commandOutput)));
             didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure);
             stop(-1);
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
index 89fa6cb23b6..58c0e20030b 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
@@ -82,7 +82,7 @@ bool FieldPageFactory::validateData(Core::Id typeId, const QVariant &data, QStri
     QList<QVariant> list = JsonWizardFactory::objectOrList(data, errorMessage);
     if (list.isEmpty()) {
         *errorMessage = QCoreApplication::translate("ProjectExplorer::JsonWizard",
-                                                    "When parsing fields of page '%1': %2")
+                                                    "When parsing fields of page \"%1\": %2")
                 .arg(typeId.toString()).arg(*errorMessage);
         return false;
     }
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 56ea77ad459..2562b7fcc4b 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -29,6 +29,7 @@
 #include "projectexplorerconstants.h"
 
 #include <utils/algorithm.h>
+#include <utils/qtcfallthrough.h>
 #include <utils/synchronousprocess.h>
 #include <utils/winutils.h>
 #include <utils/qtcassert.h>
@@ -102,7 +103,7 @@ static bool hostSupportsPlatform(MsvcToolChain::Platform platform)
         if (platform == MsvcToolChain::amd64 || platform == MsvcToolChain::amd64_arm
             || platform == MsvcToolChain::amd64_x86)
             return true;
-        // fall through (all x86 toolchains are also working on an amd64 host)
+        Q_FALLTHROUGH(); // all x86 toolchains are also working on an amd64 host
     case Utils::HostOsInfo::HostArchitectureX86:
         return platform == MsvcToolChain::x86 || platform == MsvcToolChain::x86_amd64
                 || platform == MsvcToolChain::x86_ia64 || platform == MsvcToolChain::x86_arm;
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index e8f41dcb66d..b1b55f70d57 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1488,7 +1488,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
         });
 
     expander->registerFileVariables("CurrentRun:Executable",
-        tr("The currently active run configuration's executable (if applicable)"),
+        tr("The currently active run configuration's executable (if applicable)."),
         [this]() -> QString {
             if (Target *target = activeTarget()) {
                 if (RunConfiguration *rc = target->activeRunConfiguration()) {
@@ -1847,7 +1847,7 @@ ProjectExplorerPlugin::OpenProjectResult ProjectExplorerPlugin::openProjects(con
             if (ProjectManager::canOpenProjectForMimeType(mt)) {
                 if (!QFileInfo(filePath).isFile()) {
                     appendError(errorString,
-                                tr("Failed opening project \"%1\": Project is not a file").arg(fileName));
+                                tr("Failed opening project \"%1\": Project is not a file.").arg(fileName));
                 } else if (Project *pro = ProjectManager::openProject(mt, Utils::FileName::fromString(filePath))) {
                     QObject::connect(pro, &Project::parsingFinished, [pro]() {
                         emit SessionManager::instance()->projectFinishedParsing(pro);
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index b0f06be3583..6c4336ecba9 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -936,7 +936,7 @@ void RunControlPrivate::onWorkerStarted(RunWorker *worker)
         continueStart();
         return;
     }
-    showError(tr("Unexpected run control state %1 when worker %2 started")
+    showError(tr("Unexpected run control state %1 when worker %2 started.")
               .arg(stateName(state))
               .arg(worker->d->id));
 }
@@ -1467,11 +1467,11 @@ bool RunWorkerPrivate::canStart() const
 void RunWorkerPrivate::timerEvent(QTimerEvent *ev)
 {
     if (ev->timerId() == startWatchdogTimerId) {
-        q->reportFailure(tr("Worker start timed out"));
+        q->reportFailure(tr("Worker start timed out."));
         return;
     }
     if (ev->timerId() == stopWatchdogTimerId) {
-        q->reportFailure(tr("Worker stop timed out"));
+        q->reportFailure(tr("Worker stop timed out."));
         return;
     }
 }
@@ -1610,7 +1610,7 @@ QString RunWorker::userMessageForProcessError(QProcess::ProcessError error, cons
                 "permissions to invoke the program.").arg(program);
             break;
         case QProcess::Crashed:
-            msg = tr("The process was ended forcefully");
+            msg = tr("The process was ended forcefully.");
             break;
         case QProcess::Timedout:
             // "The last waitFor...() function timed out. "
diff --git a/src/plugins/projectexplorer/taskhub.cpp b/src/plugins/projectexplorer/taskhub.cpp
index 699295af844..fe29a4ca60c 100644
--- a/src/plugins/projectexplorer/taskhub.cpp
+++ b/src/plugins/projectexplorer/taskhub.cpp
@@ -59,18 +59,19 @@ static Core::Id categoryForType(Task::TaskType type)
 class TaskMark : public TextEditor::TextMark
 {
 public:
-    TaskMark(unsigned int id, const QString &fileName, int lineNumber,
-             Task::TaskType type, bool visible) :
-        TextMark(fileName, lineNumber, categoryForType(type)),
-        m_id(id)
+    TaskMark(const Task &task) :
+        TextMark(task.file.toString(), task.line, categoryForType(task.type)),
+        m_id(task.taskId)
     {
-        setColor(type == Task::Error ? Utils::Theme::ProjectExplorer_TaskError_TextMarkColor
-                                     : Utils::Theme::ProjectExplorer_TaskWarn_TextMarkColor);
-        setDefaultToolTip(type == Task::Error ? QApplication::translate("TaskHub", "Error")
-                                              : QApplication::translate("TaskHub", "Warning"));
-        setPriority(type == Task::Error ? TextEditor::TextMark::NormalPriority
-                                        : TextEditor::TextMark::LowPriority);
-        setVisible(visible);
+        setColor(task.type == Task::Error ? Utils::Theme::ProjectExplorer_TaskError_TextMarkColor
+                                          : Utils::Theme::ProjectExplorer_TaskWarn_TextMarkColor);
+        setDefaultToolTip(task.type == Task::Error ? QApplication::translate("TaskHub", "Error")
+                                                   : QApplication::translate("TaskHub", "Warning"));
+        setPriority(task.type == Task::Error ? TextEditor::TextMark::NormalPriority
+                                             : TextEditor::TextMark::LowPriority);
+        setToolTip(task.description);
+        setIcon(task.icon);
+        setVisible(!task.icon.isNull());
     }
 
     bool isClickable() const;
@@ -151,12 +152,8 @@ void TaskHub::addTask(Task task)
         task.line = -1;
     task.movedLine = task.line;
 
-    if (task.line != -1) {
-        auto mark = new TaskMark(task.taskId, task.file.toString(), task.line, task.type, !task.icon.isNull());
-        mark->setToolTip(task.description);
-        mark->setIcon(task.icon);
-        task.setMark(mark);
-    }
+    if (task.line != -1)
+        task.setMark(new TaskMark(task));
     emit m_instance->taskAdded(task);
 }
 
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 8f57fd3c719..a229d05397c 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -210,7 +210,7 @@ void QbsBuildStep::cancel()
 QVariantMap QbsBuildStep::qbsConfiguration(VariableHandling variableHandling) const
 {
     QVariantMap config = m_qbsConfiguration;
-    config.insert(QLatin1String(Constants::QBS_FORCE_PROBES_KEY), m_forceProbes);
+    config.insert(Constants::QBS_FORCE_PROBES_KEY, m_forceProbes);
     if (variableHandling == ExpandVariables) {
         const Utils::MacroExpander *expander = Utils::globalMacroExpander();
         for (auto it = config.begin(), end = config.end(); it != end; ++it) {
@@ -227,9 +227,9 @@ void QbsBuildStep::setQbsConfiguration(const QVariantMap &config)
     QbsProject *pro = static_cast<QbsProject *>(project());
 
     QVariantMap tmp = config;
-    tmp.insert(QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY), pro->profileForTarget(target()));
-    if (!tmp.contains(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)))
-        tmp.insert(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY),
+    tmp.insert(Constants::QBS_CONFIG_PROFILE_KEY, pro->profileForTarget(target()));
+    if (!tmp.contains(Constants::QBS_CONFIG_VARIANT_KEY))
+        tmp.insert(Constants::QBS_CONFIG_VARIANT_KEY,
                    QString::fromLatin1(Constants::QBS_VARIANT_DEBUG));
 
     if (tmp == m_qbsConfiguration)
@@ -263,13 +263,13 @@ bool QbsBuildStep::cleanInstallRoot() const
 
 bool QbsBuildStep::hasCustomInstallRoot() const
 {
-    return m_qbsConfiguration.contains(QLatin1String(Constants::QBS_INSTALL_ROOT_KEY));
+    return m_qbsConfiguration.contains(Constants::QBS_INSTALL_ROOT_KEY);
 }
 
 Utils::FileName QbsBuildStep::installRoot() const
 {
     Utils::FileName root = Utils::FileName::fromString(m_qbsConfiguration
-            .value(QLatin1String(Constants::QBS_INSTALL_ROOT_KEY)).toString());
+            .value(Constants::QBS_INSTALL_ROOT_KEY).toString());
     if (root.isNull()) {
         const QbsBuildConfiguration * const bc
                 = static_cast<QbsBuildConfiguration *>(buildConfiguration());
@@ -293,15 +293,15 @@ bool QbsBuildStep::fromMap(const QVariantMap &map)
     if (!ProjectExplorer::BuildStep::fromMap(map))
         return false;
 
-    setQbsConfiguration(map.value(QLatin1String(QBS_CONFIG)).toMap());
-    m_qbsBuildOptions.setDryRun(map.value(QLatin1String(QBS_DRY_RUN)).toBool());
-    m_qbsBuildOptions.setKeepGoing(map.value(QLatin1String(QBS_KEEP_GOING)).toBool());
-    m_qbsBuildOptions.setMaxJobCount(map.value(QLatin1String(QBS_MAXJOBCOUNT)).toInt());
-    const bool showCommandLines = map.value(QLatin1String(QBS_SHOWCOMMANDLINES)).toBool();
+    setQbsConfiguration(map.value(QBS_CONFIG).toMap());
+    m_qbsBuildOptions.setDryRun(map.value(QBS_DRY_RUN).toBool());
+    m_qbsBuildOptions.setKeepGoing(map.value(QBS_KEEP_GOING).toBool());
+    m_qbsBuildOptions.setMaxJobCount(map.value(QBS_MAXJOBCOUNT).toInt());
+    const bool showCommandLines = map.value(QBS_SHOWCOMMANDLINES).toBool();
     m_qbsBuildOptions.setEchoMode(showCommandLines ? qbs::CommandEchoModeCommandLine
                                                    : qbs::CommandEchoModeSummary);
-    m_qbsBuildOptions.setInstall(map.value(QLatin1String(QBS_INSTALL), true).toBool());
-    m_qbsBuildOptions.setRemoveExistingInstallation(map.value(QLatin1String(QBS_CLEAN_INSTALL_ROOT))
+    m_qbsBuildOptions.setInstall(map.value(QBS_INSTALL, true).toBool());
+    m_qbsBuildOptions.setRemoveExistingInstallation(map.value(QBS_CLEAN_INSTALL_ROOT)
                                                     .toBool());
     m_forceProbes = map.value(forceProbesKey()).toBool();
     return true;
@@ -310,14 +310,14 @@ bool QbsBuildStep::fromMap(const QVariantMap &map)
 QVariantMap QbsBuildStep::toMap() const
 {
     QVariantMap map = ProjectExplorer::BuildStep::toMap();
-    map.insert(QLatin1String(QBS_CONFIG), m_qbsConfiguration);
-    map.insert(QLatin1String(QBS_DRY_RUN), m_qbsBuildOptions.dryRun());
-    map.insert(QLatin1String(QBS_KEEP_GOING), m_qbsBuildOptions.keepGoing());
-    map.insert(QLatin1String(QBS_MAXJOBCOUNT), m_qbsBuildOptions.maxJobCount());
-    map.insert(QLatin1String(QBS_SHOWCOMMANDLINES),
+    map.insert(QBS_CONFIG, m_qbsConfiguration);
+    map.insert(QBS_DRY_RUN, m_qbsBuildOptions.dryRun());
+    map.insert(QBS_KEEP_GOING, m_qbsBuildOptions.keepGoing());
+    map.insert(QBS_MAXJOBCOUNT, m_qbsBuildOptions.maxJobCount());
+    map.insert(QBS_SHOWCOMMANDLINES,
                m_qbsBuildOptions.echoMode() == qbs::CommandEchoModeCommandLine);
-    map.insert(QLatin1String(QBS_INSTALL), m_qbsBuildOptions.install());
-    map.insert(QLatin1String(QBS_CLEAN_INSTALL_ROOT),
+    map.insert(QBS_INSTALL, m_qbsBuildOptions.install());
+    map.insert(QBS_CLEAN_INSTALL_ROOT,
                m_qbsBuildOptions.removeExistingInstallation());
     map.insert(forceProbesKey(), m_forceProbes);
     return map;
@@ -389,7 +389,7 @@ void QbsBuildStep::handleProcessResultReport(const qbs::ProcessResult &result)
 
     m_parser->setWorkingDirectory(result.workingDirectory());
 
-    QString commandline = result.executableFilePath() + QLatin1Char(' ')
+    QString commandline = result.executableFilePath() + ' '
             + Utils::QtcProcess::joinArgs(result.arguments());
     addOutput(commandline, OutputFormat::Stdout);
 
@@ -422,15 +422,15 @@ QString QbsBuildStep::buildVariant() const
 bool QbsBuildStep::isQmlDebuggingEnabled() const
 {
     QVariantMap data = qbsConfiguration(PreserveVariables);
-    return data.value(QLatin1String(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY), false).toBool()
-            || data.value(QLatin1String(Constants::QBS_CONFIG_QUICK_DEBUG_KEY), false).toBool();
+    return data.value(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY, false).toBool()
+            || data.value(Constants::QBS_CONFIG_QUICK_DEBUG_KEY, false).toBool();
 }
 
 void QbsBuildStep::setBuildVariant(const QString &variant)
 {
-    if (m_qbsConfiguration.value(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)).toString() == variant)
+    if (m_qbsConfiguration.value(Constants::QBS_CONFIG_VARIANT_KEY).toString() == variant)
         return;
-    m_qbsConfiguration.insert(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY), variant);
+    m_qbsConfiguration.insert(Constants::QBS_CONFIG_VARIANT_KEY, variant);
     emit qbsConfigurationChanged();
     QbsBuildConfiguration *bc = static_cast<QbsBuildConfiguration *>(buildConfiguration());
     if (bc)
@@ -629,18 +629,17 @@ void QbsBuildStepConfigWidget::updateState()
     updateQmlDebuggingOption();
 
     const QString buildVariant = m_step->buildVariant();
-    const int idx = (buildVariant == QLatin1String(Constants::QBS_VARIANT_DEBUG)) ? 0 : 1;
+    const int idx = (buildVariant == Constants::QBS_VARIANT_DEBUG) ? 0 : 1;
     m_ui->buildVariantComboBox->setCurrentIndex(idx);
     QString command = static_cast<QbsBuildConfiguration *>(m_step->buildConfiguration())
             ->equivalentCommandLine(m_step);
 
     for (int i = 0; i < m_propertyCache.count(); ++i) {
-        command += QLatin1Char(' ') + m_propertyCache.at(i).name
-                + QLatin1Char(':') + m_propertyCache.at(i).effectiveValue;
+        command += ' ' + m_propertyCache.at(i).name + ':' + m_propertyCache.at(i).effectiveValue;
     }
 
     if (m_step->isQmlDebuggingEnabled())
-        command += QLatin1String(" Qt.declarative.qmlDebugging:true Qt.quick.qmlDebugging:true");
+        command += " Qt.declarative.qmlDebugging:true Qt.quick.qmlDebugging:true";
     m_ui->commandLineTextEdit->setPlainText(command);
 
     QString summary = tr("<b>Qbs:</b> %1").arg(command);
@@ -670,16 +669,16 @@ void QbsBuildStepConfigWidget::updatePropertyEdit(const QVariantMap &data)
     QVariantMap editable = data;
 
     // remove data that is edited with special UIs:
-    editable.remove(QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY));
-    editable.remove(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY));
-    editable.remove(QLatin1String(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY));
-    editable.remove(QLatin1String(Constants::QBS_CONFIG_QUICK_DEBUG_KEY));
-    editable.remove(QLatin1String(Constants::QBS_FORCE_PROBES_KEY));
-    editable.remove(QLatin1String(Constants::QBS_INSTALL_ROOT_KEY));
+    editable.remove(Constants::QBS_CONFIG_PROFILE_KEY);
+    editable.remove(Constants::QBS_CONFIG_VARIANT_KEY);
+    editable.remove(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY);
+    editable.remove(Constants::QBS_CONFIG_QUICK_DEBUG_KEY);
+    editable.remove(Constants::QBS_FORCE_PROBES_KEY);
+    editable.remove(Constants::QBS_INSTALL_ROOT_KEY);
 
     QStringList propertyList;
     for (QVariantMap::const_iterator i = editable.constBegin(); i != editable.constEnd(); ++i)
-        propertyList.append(i.key() + QLatin1Char(':') + i.value().toString());
+        propertyList.append(i.key() + ':' + i.value().toString());
 
     m_ui->propertyEdit->setText(Utils::QtcProcess::joinArgs(propertyList));
 }
@@ -688,9 +687,9 @@ void QbsBuildStepConfigWidget::changeBuildVariant(int idx)
 {
     QString variant;
     if (idx == 1)
-        variant = QLatin1String(Constants::QBS_VARIANT_RELEASE);
+        variant = Constants::QBS_VARIANT_RELEASE;
     else
-        variant = QLatin1String(Constants::QBS_VARIANT_DEBUG);
+        variant = Constants::QBS_VARIANT_DEBUG;
     m_ignoreChange = true;
     m_step->setBuildVariant(variant);
     m_ignoreChange = false;
@@ -768,16 +767,16 @@ void QbsBuildStepConfigWidget::applyCachedProperties()
     const QVariantMap tmp = m_step->qbsConfiguration(QbsBuildStep::PreserveVariables);
 
     // Insert values set up with special UIs:
-    data.insert(QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY),
-                tmp.value(QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY)));
-    data.insert(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY),
-                tmp.value(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)));
-    if (tmp.contains(QLatin1String(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY)))
-        data.insert(QLatin1String(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY),
-                    tmp.value(QLatin1String(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY)));
-    if (tmp.contains(QLatin1String(Constants::QBS_CONFIG_QUICK_DEBUG_KEY)))
-        data.insert(QLatin1String(Constants::QBS_CONFIG_QUICK_DEBUG_KEY),
-                    tmp.value(QLatin1String(Constants::QBS_CONFIG_QUICK_DEBUG_KEY)));
+    data.insert(Constants::QBS_CONFIG_PROFILE_KEY,
+                tmp.value(Constants::QBS_CONFIG_PROFILE_KEY));
+    data.insert(Constants::QBS_CONFIG_VARIANT_KEY,
+                tmp.value(Constants::QBS_CONFIG_VARIANT_KEY));
+    if (tmp.contains(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY))
+        data.insert(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY,
+                    tmp.value(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY));
+    if (tmp.contains(Constants::QBS_CONFIG_QUICK_DEBUG_KEY))
+        data.insert(Constants::QBS_CONFIG_QUICK_DEBUG_KEY,
+                    tmp.value(Constants::QBS_CONFIG_QUICK_DEBUG_KEY));
 
     for (int i = 0; i < m_propertyCache.count(); ++i) {
         const Property &property = m_propertyCache.at(i);
@@ -793,11 +792,11 @@ void QbsBuildStepConfigWidget::linkQmlDebuggingLibraryChecked(bool checked)
 {
     QVariantMap data = m_step->qbsConfiguration(QbsBuildStep::PreserveVariables);
     if (checked) {
-        data.insert(QLatin1String(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY), checked);
-        data.insert(QLatin1String(Constants::QBS_CONFIG_QUICK_DEBUG_KEY), checked);
+        data.insert(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY, checked);
+        data.insert(Constants::QBS_CONFIG_QUICK_DEBUG_KEY, checked);
     } else {
-        data.remove(QLatin1String(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY));
-        data.remove(QLatin1String(Constants::QBS_CONFIG_QUICK_DEBUG_KEY));
+        data.remove(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY);
+        data.remove(Constants::QBS_CONFIG_QUICK_DEBUG_KEY);
     }
 
     m_ignoreChange = true;
@@ -819,7 +818,7 @@ bool QbsBuildStepConfigWidget::validateProperties(Utils::FancyLineEdit *edit, QS
     QList<Property> properties;
     const Utils::MacroExpander *expander = Utils::globalMacroExpander();
     foreach (const QString &rawArg, argList) {
-        int pos = rawArg.indexOf(QLatin1Char(':'));
+        int pos = rawArg.indexOf(':');
         if (pos > 0) {
             const QString rawValue = rawArg.mid(pos + 1);
             Property property(rawArg.left(pos), rawValue, expander->expand(rawValue));
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index da88f9ab4a5..f9673887d96 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -46,6 +46,7 @@
 #include <cpptools/cppprojectupdater.h>
 #include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/buildenvironmentwidget.h>
+#include <projectexplorer/buildinfo.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildtargetinfo.h>
 #include <projectexplorer/deploymentdata.h>
@@ -688,6 +689,30 @@ QString QbsProject::uniqueProductName(const qbs::ProductData &product)
     return product.name() + QLatin1Char('.') + product.profile();
 }
 
+void QbsProject::configureAsExampleProject(const QSet<Id> &platforms)
+{
+    QList<const BuildInfo *> infoList;
+    QList<Kit *> kits = KitManager::kits();
+    const auto qtVersionMatchesPlatform = [platforms](const QtSupport::BaseQtVersion *version) {
+        return platforms.isEmpty() || platforms.intersects(version->targetDeviceTypes());
+    };
+    foreach (Kit *k, kits) {
+        const QtSupport::BaseQtVersion * const qtVersion
+                = QtSupport::QtKitInformation::qtVersion(k);
+        if (!qtVersion || !qtVersionMatchesPlatform(qtVersion))
+            continue;
+        const IBuildConfigurationFactory * const factory
+                = IBuildConfigurationFactory::find(k, projectFilePath().toString());
+        if (!factory)
+            continue;
+        for (BuildInfo * const info : factory->availableSetups(k, projectFilePath().toString()))
+            infoList << info;
+    }
+    setup(infoList);
+    qDeleteAll(infoList);
+    prepareForParsing();
+}
+
 void QbsProject::parse(const QVariantMap &config, const Environment &env, const QString &dir,
                        const QString &configName)
 {
diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h
index 8ff26640743..23e0f706b90 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.h
+++ b/src/plugins/qbsprojectmanager/qbsproject.h
@@ -108,6 +108,8 @@ public:
                                       const qbs::ProductData &product);
     static QString uniqueProductName(const qbs::ProductData &product);
 
+    void configureAsExampleProject(const QSet<Core::Id> &platforms) final;
+
     void invalidate();
     void delayParsing();
 
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h
index 3195bb8d654..e53beb84fe5 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h
@@ -60,19 +60,19 @@ const char QBS_CLEANSTEP_ID[] = "Qbs.CleanStep";
 const char QBS_INSTALLSTEP_ID[] = "Qbs.InstallStep";
 
 // QBS strings:
-static const char QBS_VARIANT_DEBUG[] = "debug";
-static const char QBS_VARIANT_RELEASE[] = "release";
+const char QBS_VARIANT_DEBUG[] = "debug";
+const char QBS_VARIANT_RELEASE[] = "release";
 
-static const char QBS_CONFIG_VARIANT_KEY[] = "qbs.buildVariant";
-static const char QBS_CONFIG_PROFILE_KEY[] = "qbs.profile";
-static const char QBS_INSTALL_ROOT_KEY[] = "qbs.installRoot";
-static const char QBS_CONFIG_DECLARATIVE_DEBUG_KEY[] = "Qt.declarative.qmlDebugging";
-static const char QBS_CONFIG_QUICK_DEBUG_KEY[] = "Qt.quick.qmlDebugging";
+const char QBS_CONFIG_VARIANT_KEY[] = "qbs.buildVariant";
+const char QBS_CONFIG_PROFILE_KEY[] = "qbs.profile";
+const char QBS_INSTALL_ROOT_KEY[] = "qbs.installRoot";
+const char QBS_CONFIG_DECLARATIVE_DEBUG_KEY[] = "Qt.declarative.qmlDebugging";
+const char QBS_CONFIG_QUICK_DEBUG_KEY[] = "Qt.quick.qmlDebugging";
 const char QBS_FORCE_PROBES_KEY[] = "qbspm.forceProbes";
 
 // Icons:
-static const char QBS_GROUP_ICON[] = ":/qbsprojectmanager/images/groups.png";
-static const char QBS_PRODUCT_OVERLAY_ICON[] = ":/qbsprojectmanager/images/productgear.png";
+const char QBS_GROUP_ICON[] = ":/qbsprojectmanager/images/groups.png";
+const char QBS_PRODUCT_OVERLAY_ICON[] = ":/qbsprojectmanager/images/productgear.png";
 
 // Toolchain related settings:
 const char QBS_TARGETOS[] = "qbs.targetOS";
diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp
index aea591e5abd..358fb05bc99 100644
--- a/src/plugins/qmakeprojectmanager/makefileparse.cpp
+++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp
@@ -244,7 +244,6 @@ void MakeFileParse::parseAssignments(QList<QMakeAssignment> *assignments)
 
 static FileName findQMakeBinaryFromMakefile(const QString &makefile)
 {
-    bool debugAdding = false;
     QFile fi(makefile);
     if (fi.exists() && fi.open(QFile::ReadOnly)) {
         QTextStream ts(&fi);
@@ -252,8 +251,6 @@ static FileName findQMakeBinaryFromMakefile(const QString &makefile)
         while (!ts.atEnd()) {
             QString line = ts.readLine();
             if (r1.exactMatch(line)) {
-                if (debugAdding)
-                    qDebug()<<"#~~ QMAKE is:"<<r1.cap(1).trimmed();
                 QFileInfo qmake(r1.cap(1).trimmed());
                 QString qmakePath = qmake.filePath();
                 if (!QString::fromLatin1(QTC_HOST_EXE_SUFFIX).isEmpty()
diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp
index c1abcc2a6fa..b30ff1ce187 100644
--- a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp
+++ b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp
@@ -24,330 +24,282 @@
 ****************************************************************************/
 
 #include "profilecompletionassist.h"
-#include "qmakeprojectmanagerconstants.h"
 
-#include <texteditor/codeassist/assistinterface.h>
-#include <texteditor/codeassist/keywordscompletionassist.h>
-#include <texteditor/texteditorconstants.h>
+#include "texteditor/codeassist/keywordscompletionassist.h"
 
-#include <coreplugin/id.h>
-
-using namespace QmakeProjectManager::Internal;
-using namespace TextEditor;
-
-
-static const char *const variableKeywords[] = {
-    "CCFLAG",
-    "CLEAN_DEPS",
-    "CONFIG",
-    "DEFINES",
-    "DEF_FILE",
-    "DEPENDPATH",
-    "DEPLOYMENT",
-    "DEPLOYMENT_PLUGIN",
-    "DESTDIR",
-    "DESTDIR_TARGET",
-    "DISTFILES",
-    "DLLDESTDIR",
-    "DSP_TEMPLATE",
-    "FORMS",
-    "FORMS3",
-    "GUID",
-    "HEADERS",
-    "ICON",
-    "INCLUDEPATH",
-    "INSTALLS",
-    "LEXIMPLS",
-    "LEXOBJECTS",
-    "LEXSOURCES",
-    "LIBS",
-    "LITERAL_HASH",
-    "MAKEFILE",
-    "MAKEFILE_GENERATOR",
-    "MOBILITY",
-    "MOC_DIR",
-    "OBJECTIVE_HEADERS",
-    "OBJECTIVE_SOURCES",
-    "OBJECTS",
-    "OBJECTS_DIR",
-    "OBJMOC",
-    "OTHER_FILES",
-    "OUT_PWD",
-    "PKGCONFIG",
-    "POST_TARGETDEPS",
-    "PRECOMPILED_HEADER",
-    "PRE_TARGETDEPS",
-    "PWD",
-    "QMAKE",
-    "QMAKESPEC",
-    "QMAKE_APP_FLAG",
-    "QMAKE_APP_OR_DLL",
-    "QMAKE_AR_CMD",
-    "QMAKE_BUNDLE_DATA",
-    "QMAKE_BUNDLE_EXTENSION",
-    "QMAKE_CC",
-    "QMAKE_CFLAGS",
-    "QMAKE_CFLAGS_DEBUG",
-    "QMAKE_CFLAGS_MT",
-    "QMAKE_CFLAGS_MT_DBG",
-    "QMAKE_CFLAGS_MT_DLL",
-    "QMAKE_CFLAGS_MT_DLLDBG",
-    "QMAKE_CFLAGS_RELEASE",
-    "QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO",
-    "QMAKE_CFLAGS_SHLIB",
-    "QMAKE_CFLAGS_THREAD",
-    "QMAKE_CFLAGS_WARN_OFF",
-    "QMAKE_CFLAGS_WARN_ON",
-    "QMAKE_CLEAN",
-    "QMAKE_CXX",
-    "QMAKE_CXXFLAGS",
-    "QMAKE_CXXFLAGS_DEBUG",
-    "QMAKE_CXXFLAGS_MT",
-    "QMAKE_CXXFLAGS_MT_DBG",
-    "QMAKE_CXXFLAGS_MT_DLL",
-    "QMAKE_CXXFLAGS_MT_DLLDBG",
-    "QMAKE_CXXFLAGS_RELEASE",
-    "QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO",
-    "QMAKE_CXXFLAGS_SHLIB",
-    "QMAKE_CXXFLAGS_THREAD",
-    "QMAKE_CXXFLAGS_WARN_OFF",
-    "QMAKE_CXXFLAGS_WARN_ON",
-    "QMAKE_DISTCLEAN",
-    "QMAKE_EXTENSION_SHLIB",
-    "QMAKE_EXTRA_COMPILERS",
-    "QMAKE_EXTRA_TARGETS",
-    "QMAKE_EXT_CPP",
-    "QMAKE_EXT_H",
-    "QMAKE_EXT_LEX",
-    "QMAKE_EXT_MOC",
-    "QMAKE_EXT_OBJ",
-    "QMAKE_EXT_PRL",
-    "QMAKE_EXT_UI",
-    "QMAKE_EXT_YACC",
-    "QMAKE_FAILED_REQUIREMENTS",
-    "QMAKE_FRAMEWORK_BUNDLE_NAME",
-    "QMAKE_FRAMEWORK_VERSION",
-    "QMAKE_INCDIR",
-    "QMAKE_INCDIR_EGL",
-    "QMAKE_INCDIR_OPENGL",
-    "QMAKE_INCDIR_OPENGL_ES1",
-    "QMAKE_INCDIR_OPENGL_ES2",
-    "QMAKE_INCDIR_OPENVG",
-    "QMAKE_INCDIR_QT",
-    "QMAKE_INCDIR_THREAD",
-    "QMAKE_INCDIR_X11",
-    "QMAKE_INFO_PLIST",
-    "QMAKE_LFLAGS",
-    "QMAKE_LFLAGS_CONSOLE",
-    "QMAKE_LFLAGS_CONSOLE_DLL",
-    "QMAKE_LFLAGS_DEBUG",
-    "QMAKE_LFLAGS_PLUGIN",
-    "QMAKE_LFLAGS_QT_DLL",
-    "QMAKE_LFLAGS_RELEASE",
-    "QMAKE_LFLAGS_RPATH",
-    "QMAKE_LFLAGS_SHAPP",
-    "QMAKE_LFLAGS_SHLIB",
-    "QMAKE_LFLAGS_SONAME",
-    "QMAKE_LFLAGS_THREAD",
-    "QMAKE_LFLAGS_WINDOWS",
-    "QMAKE_LFLAGS_WINDOWS_DLL",
-    "QMAKE_LIBDIR",
-    "QMAKE_LIBDIR_EGL",
-    "QMAKE_LIBDIR_FLAGS",
-    "QMAKE_LIBDIR_OPENGL",
-    "QMAKE_LIBDIR_OPENVG",
-    "QMAKE_LIBDIR_QT",
-    "QMAKE_LIBDIR_X11",
-    "QMAKE_LIBS",
-    "QMAKE_LIBS_CONSOLE",
-    "QMAKE_LIBS_EGL",
-    "QMAKE_LIBS_OPENGL",
-    "QMAKE_LIBS_OPENGL_ES1",
-    "QMAKE_LIBS_OPENGL_ES2",
-    "QMAKE_LIBS_OPENGL_QT",
-    "QMAKE_LIBS_OPENVG",
-    "QMAKE_LIBS_QT",
-    "QMAKE_LIBS_QT_DLL",
-    "QMAKE_LIBS_QT_OPENGL",
-    "QMAKE_LIBS_QT_THREAD",
-    "QMAKE_LIBS_RT",
-    "QMAKE_LIBS_RTMT",
-    "QMAKE_LIBS_THREAD",
-    "QMAKE_LIBS_WINDOWS",
-    "QMAKE_LIBS_X11",
-    "QMAKE_LIBS_X11SM",
-    "QMAKE_LIB_FLAG",
-    "QMAKE_LINK",
-    "QMAKE_LINK_SHLIB_CMD",
-    "QMAKE_LN_SHLIB",
-    "QMAKE_MACOSX_DEPLOYMENT_TARGET",
-    "QMAKE_MAC_SDK",
-    "QMAKE_MAKEFILE",
-    "QMAKE_MOC_SRC",
-    "QMAKE_POST_LINK",
-    "QMAKE_PRE_LINK",
-    "QMAKE_PROJECT_NAME",
-    "QMAKE_QMAKE",
-    "QMAKE_QT_DLL",
-    "QMAKE_RESOURCE_FLAGS",
-    "QMAKE_RPATH",
-    "QMAKE_RPATHDIR",
-    "QMAKE_RUN_CC",
-    "QMAKE_RUN_CC_IMP",
-    "QMAKE_RUN_CXX",
-    "QMAKE_RUN_CXX_IMP",
-    "QMAKE_TARGET",
-    "QMAKE_UIC",
-    "QT",
-    "QTPLUGIN",
-    "QT_MAJOR_VERSION",
-    "QT_MINOR_VERSION",
-    "QT_PATCH_VERSION",
-    "QT_VERSION",
-    "RCC_DIR",
-    "RC_FILE",
-    "REQUIRES",
-    "RESOURCES",
-    "RES_FILE",
-    "RSS_RULES",
-    "SIGNATURE_FILE",
-    "SOURCES",
-    "SRCMOC",
-    "STATECHARTS",
-    "SUBDIRS",
-    "TARGET",
-    "TEMPLATE",
-    "TRANSLATIONS",
-    "UICIMPLS",
-    "UICOBJECTS",
-    "UI_DIR",
-    "UI_HEADERS_DIR",
-    "UI_SOURCES_DIR",
-    "VERSION",
-    "VERSION_PE_HEADER",
-    "VER_MAJ",
-    "VER_MIN",
-    "VER_PAT",
-    "VPATH",
-    "YACCIMPLS",
-    "YACCOBJECTS",
-    "YACCSOURCES",
-    "_PRO_FILE_",
-    "_PRO_FILE_PWD_",
-    0
-};
-
-static const char *const functionKeywords[] = {
-    "CONFIG",
-    "absolute_path",
-    "basename",
-    "cache",
-    "cat",
-    "clean_path",
-    "clear",
-    "contains",
-    "count",
-    "debug",
-    "defined",
-    "dirname",
-    "enumerate_vars",
-    "equals",
-    "error",
-    "escape_expand",
-    "eval",
-    "exists",
-    "export",
-    "files",
-    "find",
-    "first",
-    "for",
-    "format_number",
-    "fromfile",
-    "getenv",
-    "greaterThan",
-    "if",
-    "include",
-    "infile",
-    "isActiveConfig",
-    "isEmpty",
-    "isEqual",
-    "join",
-    "last",
-    "lessThan",
-    "list",
-    "load",
-    "log",
-    "lower",
-    "member",
-    "message",
-    "mkpath",
-    "packagesExist",
-    "parseJson",
-    "prompt",
-    "quote",
-    "re_escape",
-    "relative_path",
-    "replace",
-    "requires",
-    "resolve_depends",
-    "reverse",
-    "section",
-    "shadowed",
-    "shell_path",
-    "shell_quote",
-    "size",
-    "sort_depends",
-    "split",
-    "sprintf",
-    "system",
-    "system_path",
-    "system_quote",
-    "title",
-    "touch",
-    "unique",
-    "unset",
-    "upper",
-    "val_escape",
-    "warning",
-    "write_file",
-    0
-};
-
-// -------------------------------
-// ProFileCompletionAssistProvider
-// -------------------------------
-void ProFileCompletionAssistProvider::init()
-{
-    for (uint i = 0; i < sizeof variableKeywords / sizeof variableKeywords[0] - 1; i++)
-        m_variables.append(QLatin1String(variableKeywords[i]));
-    for (uint i = 0; i < sizeof functionKeywords / sizeof functionKeywords[0] - 1; i++)
-        m_functions.append(QLatin1String(functionKeywords[i]));
-}
-
-ProFileCompletionAssistProvider::~ProFileCompletionAssistProvider()
-{
-}
-
-IAssistProcessor *ProFileCompletionAssistProvider::createProcessor() const
-{
-    if (m_variables.isEmpty())
-        const_cast<ProFileCompletionAssistProvider *>(this)->init();
-    TextEditor::Keywords keywords = TextEditor::Keywords(m_variables, m_functions, QMap<QString, QStringList>());
-    auto processor = new KeywordsCompletionAssistProcessor(keywords);
-    processor->setSnippetGroup(TextEditor::Constants::TEXT_SNIPPET_GROUP_ID);
-    return processor;
-}
-
-QStringList ProFileCompletionAssistProvider::variables() const
-{
-    if (m_variables.isEmpty())
-        const_cast<ProFileCompletionAssistProvider *>(this)->init();
-    return m_variables;
-}
-
-QStringList ProFileCompletionAssistProvider::functions() const
+const TextEditor::Keywords &QmakeProjectManager::Internal::qmakeKeywords()
 {
-    if (m_functions.isEmpty())
-        const_cast<ProFileCompletionAssistProvider *>(this)->init();
-    return m_functions;
+    static TextEditor::Keywords keywords(
+                QStringList{ // variables
+                    "CCFLAG",
+                    "CLEAN_DEPS",
+                    "CONFIG",
+                    "DEFINES",
+                    "DEF_FILE",
+                    "DEPENDPATH",
+                    "DEPLOYMENT",
+                    "DEPLOYMENT_PLUGIN",
+                    "DESTDIR",
+                    "DESTDIR_TARGET",
+                    "DISTFILES",
+                    "DLLDESTDIR",
+                    "DSP_TEMPLATE",
+                    "FORMS",
+                    "FORMS3",
+                    "GUID",
+                    "HEADERS",
+                    "ICON",
+                    "INCLUDEPATH",
+                    "INSTALLS",
+                    "LEXIMPLS",
+                    "LEXOBJECTS",
+                    "LEXSOURCES",
+                    "LIBS",
+                    "LITERAL_HASH",
+                    "MAKEFILE",
+                    "MAKEFILE_GENERATOR",
+                    "MOBILITY",
+                    "MOC_DIR",
+                    "OBJECTIVE_HEADERS",
+                    "OBJECTIVE_SOURCES",
+                    "OBJECTS",
+                    "OBJECTS_DIR",
+                    "OBJMOC",
+                    "OTHER_FILES",
+                    "OUT_PWD",
+                    "PKGCONFIG",
+                    "POST_TARGETDEPS",
+                    "PRECOMPILED_HEADER",
+                    "PRE_TARGETDEPS",
+                    "PWD",
+                    "QMAKE",
+                    "QMAKESPEC",
+                    "QMAKE_APP_FLAG",
+                    "QMAKE_APP_OR_DLL",
+                    "QMAKE_AR_CMD",
+                    "QMAKE_BUNDLE_DATA",
+                    "QMAKE_BUNDLE_EXTENSION",
+                    "QMAKE_CC",
+                    "QMAKE_CFLAGS",
+                    "QMAKE_CFLAGS_DEBUG",
+                    "QMAKE_CFLAGS_MT",
+                    "QMAKE_CFLAGS_MT_DBG",
+                    "QMAKE_CFLAGS_MT_DLL",
+                    "QMAKE_CFLAGS_MT_DLLDBG",
+                    "QMAKE_CFLAGS_RELEASE",
+                    "QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO",
+                    "QMAKE_CFLAGS_SHLIB",
+                    "QMAKE_CFLAGS_THREAD",
+                    "QMAKE_CFLAGS_WARN_OFF",
+                    "QMAKE_CFLAGS_WARN_ON",
+                    "QMAKE_CLEAN",
+                    "QMAKE_CXX",
+                    "QMAKE_CXXFLAGS",
+                    "QMAKE_CXXFLAGS_DEBUG",
+                    "QMAKE_CXXFLAGS_MT",
+                    "QMAKE_CXXFLAGS_MT_DBG",
+                    "QMAKE_CXXFLAGS_MT_DLL",
+                    "QMAKE_CXXFLAGS_MT_DLLDBG",
+                    "QMAKE_CXXFLAGS_RELEASE",
+                    "QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO",
+                    "QMAKE_CXXFLAGS_SHLIB",
+                    "QMAKE_CXXFLAGS_THREAD",
+                    "QMAKE_CXXFLAGS_WARN_OFF",
+                    "QMAKE_CXXFLAGS_WARN_ON",
+                    "QMAKE_DISTCLEAN",
+                    "QMAKE_EXTENSION_SHLIB",
+                    "QMAKE_EXTRA_COMPILERS",
+                    "QMAKE_EXTRA_TARGETS",
+                    "QMAKE_EXT_CPP",
+                    "QMAKE_EXT_H",
+                    "QMAKE_EXT_LEX",
+                    "QMAKE_EXT_MOC",
+                    "QMAKE_EXT_OBJ",
+                    "QMAKE_EXT_PRL",
+                    "QMAKE_EXT_UI",
+                    "QMAKE_EXT_YACC",
+                    "QMAKE_FAILED_REQUIREMENTS",
+                    "QMAKE_FRAMEWORK_BUNDLE_NAME",
+                    "QMAKE_FRAMEWORK_VERSION",
+                    "QMAKE_INCDIR",
+                    "QMAKE_INCDIR_EGL",
+                    "QMAKE_INCDIR_OPENGL",
+                    "QMAKE_INCDIR_OPENGL_ES1",
+                    "QMAKE_INCDIR_OPENGL_ES2",
+                    "QMAKE_INCDIR_OPENVG",
+                    "QMAKE_INCDIR_QT",
+                    "QMAKE_INCDIR_THREAD",
+                    "QMAKE_INCDIR_X11",
+                    "QMAKE_INFO_PLIST",
+                    "QMAKE_LFLAGS",
+                    "QMAKE_LFLAGS_CONSOLE",
+                    "QMAKE_LFLAGS_CONSOLE_DLL",
+                    "QMAKE_LFLAGS_DEBUG",
+                    "QMAKE_LFLAGS_PLUGIN",
+                    "QMAKE_LFLAGS_QT_DLL",
+                    "QMAKE_LFLAGS_RELEASE",
+                    "QMAKE_LFLAGS_RPATH",
+                    "QMAKE_LFLAGS_SHAPP",
+                    "QMAKE_LFLAGS_SHLIB",
+                    "QMAKE_LFLAGS_SONAME",
+                    "QMAKE_LFLAGS_THREAD",
+                    "QMAKE_LFLAGS_WINDOWS",
+                    "QMAKE_LFLAGS_WINDOWS_DLL",
+                    "QMAKE_LIBDIR",
+                    "QMAKE_LIBDIR_EGL",
+                    "QMAKE_LIBDIR_FLAGS",
+                    "QMAKE_LIBDIR_OPENGL",
+                    "QMAKE_LIBDIR_OPENVG",
+                    "QMAKE_LIBDIR_QT",
+                    "QMAKE_LIBDIR_X11",
+                    "QMAKE_LIBS",
+                    "QMAKE_LIBS_CONSOLE",
+                    "QMAKE_LIBS_EGL",
+                    "QMAKE_LIBS_OPENGL",
+                    "QMAKE_LIBS_OPENGL_ES1",
+                    "QMAKE_LIBS_OPENGL_ES2",
+                    "QMAKE_LIBS_OPENGL_QT",
+                    "QMAKE_LIBS_OPENVG",
+                    "QMAKE_LIBS_QT",
+                    "QMAKE_LIBS_QT_DLL",
+                    "QMAKE_LIBS_QT_OPENGL",
+                    "QMAKE_LIBS_QT_THREAD",
+                    "QMAKE_LIBS_RT",
+                    "QMAKE_LIBS_RTMT",
+                    "QMAKE_LIBS_THREAD",
+                    "QMAKE_LIBS_WINDOWS",
+                    "QMAKE_LIBS_X11",
+                    "QMAKE_LIBS_X11SM",
+                    "QMAKE_LIB_FLAG",
+                    "QMAKE_LINK",
+                    "QMAKE_LINK_SHLIB_CMD",
+                    "QMAKE_LN_SHLIB",
+                    "QMAKE_MACOSX_DEPLOYMENT_TARGET",
+                    "QMAKE_MAC_SDK",
+                    "QMAKE_MAKEFILE",
+                    "QMAKE_MOC_SRC",
+                    "QMAKE_POST_LINK",
+                    "QMAKE_PRE_LINK",
+                    "QMAKE_PROJECT_NAME",
+                    "QMAKE_QMAKE",
+                    "QMAKE_QT_DLL",
+                    "QMAKE_RESOURCE_FLAGS",
+                    "QMAKE_RPATH",
+                    "QMAKE_RPATHDIR",
+                    "QMAKE_RUN_CC",
+                    "QMAKE_RUN_CC_IMP",
+                    "QMAKE_RUN_CXX",
+                    "QMAKE_RUN_CXX_IMP",
+                    "QMAKE_TARGET",
+                    "QMAKE_UIC",
+                    "QT",
+                    "QTPLUGIN",
+                    "QT_MAJOR_VERSION",
+                    "QT_MINOR_VERSION",
+                    "QT_PATCH_VERSION",
+                    "QT_VERSION",
+                    "RCC_DIR",
+                    "RC_FILE",
+                    "REQUIRES",
+                    "RESOURCES",
+                    "RES_FILE",
+                    "RSS_RULES",
+                    "SIGNATURE_FILE",
+                    "SOURCES",
+                    "SRCMOC",
+                    "STATECHARTS",
+                    "SUBDIRS",
+                    "TARGET",
+                    "TEMPLATE",
+                    "TRANSLATIONS",
+                    "UICIMPLS",
+                    "UICOBJECTS",
+                    "UI_DIR",
+                    "UI_HEADERS_DIR",
+                    "UI_SOURCES_DIR",
+                    "VERSION",
+                    "VERSION_PE_HEADER",
+                    "VER_MAJ",
+                    "VER_MIN",
+                    "VER_PAT",
+                    "VPATH",
+                    "YACCIMPLS",
+                    "YACCOBJECTS",
+                    "YACCSOURCES",
+                    "_PRO_FILE_",
+                    "_PRO_FILE_PWD_"},
+                QStringList{ // functions
+                    "CONFIG",
+                    "absolute_path",
+                    "basename",
+                    "cache",
+                    "cat",
+                    "clean_path",
+                    "clear",
+                    "contains",
+                    "count",
+                    "debug",
+                    "defined",
+                    "dirname",
+                    "enumerate_vars",
+                    "equals",
+                    "error",
+                    "escape_expand",
+                    "eval",
+                    "exists",
+                    "export",
+                    "files",
+                    "find",
+                    "first",
+                    "for",
+                    "format_number",
+                    "fromfile",
+                    "getenv",
+                    "greaterThan",
+                    "if",
+                    "include",
+                    "infile",
+                    "isActiveConfig",
+                    "isEmpty",
+                    "isEqual",
+                    "join",
+                    "last",
+                    "lessThan",
+                    "list",
+                    "load",
+                    "log",
+                    "lower",
+                    "member",
+                    "message",
+                    "mkpath",
+                    "packagesExist",
+                    "parseJson",
+                    "prompt",
+                    "quote",
+                    "re_escape",
+                    "relative_path",
+                    "replace",
+                    "requires",
+                    "resolve_depends",
+                    "reverse",
+                    "section",
+                    "shadowed",
+                    "shell_path",
+                    "shell_quote",
+                    "size",
+                    "sort_depends",
+                    "split",
+                    "sprintf",
+                    "system",
+                    "system_path",
+                    "system_quote",
+                    "title",
+                    "touch",
+                    "unique",
+                    "unset",
+                    "upper",
+                    "val_escape",
+                    "warning",
+                    "write_file"});
+    return keywords;
 }
diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.h b/src/plugins/qmakeprojectmanager/profilecompletionassist.h
index 76c77a95f06..85ffec0dfd5 100644
--- a/src/plugins/qmakeprojectmanager/profilecompletionassist.h
+++ b/src/plugins/qmakeprojectmanager/profilecompletionassist.h
@@ -25,29 +25,11 @@
 
 #pragma once
 
-#include <texteditor/codeassist/completionassistprovider.h>
-
-#include <QStringList>
-
+namespace TextEditor { class Keywords; }
 namespace QmakeProjectManager {
 namespace Internal {
 
-class ProFileCompletionAssistProvider : public TextEditor::CompletionAssistProvider
-{
-    Q_OBJECT
-
-public:
-    void init();
-    ~ProFileCompletionAssistProvider();
-
-    TextEditor::IAssistProcessor *createProcessor() const override;
-    QStringList variables() const;
-    QStringList functions() const;
-
-private:
-    QStringList m_variables;
-    QStringList m_functions;
-};
+const TextEditor::Keywords &qmakeKeywords();
 
 } // namespace Internal
 } // namespace QmakeProjectManager
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index ada9054589d..97c119c456e 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -182,16 +182,14 @@ ProFileEditorFactory::ProFileEditorFactory()
     setDocumentCreator(createProFileDocument);
     setEditorWidgetCreator([]() { return new ProFileEditorWidget; });
 
-    ProFileCompletionAssistProvider *pcap = new ProFileCompletionAssistProvider;
-    setCompletionAssistProvider(pcap);
+    setCompletionAssistProvider(new KeywordsCompletionAssistProvider(qmakeKeywords()));
 
     setCommentDefinition(Utils::CommentDefinition::HashStyle);
     setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection
                 | TextEditorActionHandler::JumpToFileUnderCursor);
 
-    Keywords keywords(pcap->variables(), pcap->functions(), QMap<QString, QStringList>());
-    addHoverHandler(new ProFileHoverHandler(keywords));
-    setSyntaxHighlighterCreator([keywords]() { return new ProFileHighlighter(keywords); });
+    addHoverHandler(new ProFileHoverHandler);
+    setSyntaxHighlighterCreator([]() { return new ProFileHighlighter; });
 
     const QString defaultOverlay = QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QT);
     Core::FileIconProvider::registerIconOverlayForSuffix(
diff --git a/src/plugins/qmakeprojectmanager/profilehighlighter.cpp b/src/plugins/qmakeprojectmanager/profilehighlighter.cpp
index 0cbfb09b2eb..4b4236fcb2f 100644
--- a/src/plugins/qmakeprojectmanager/profilehighlighter.cpp
+++ b/src/plugins/qmakeprojectmanager/profilehighlighter.cpp
@@ -52,8 +52,8 @@ static TextStyle styleForFormat(int format)
     return C_TEXT;
 }
 
-ProFileHighlighter::ProFileHighlighter(const Keywords &keywords)
-    : m_keywords(keywords)
+ProFileHighlighter::ProFileHighlighter()
+    : m_keywords(qmakeKeywords())
 {
     setTextFormatCategories(NumProfileFormats, styleForFormat);
 }
diff --git a/src/plugins/qmakeprojectmanager/profilehighlighter.h b/src/plugins/qmakeprojectmanager/profilehighlighter.h
index 98de83c9c28..9d85861af85 100644
--- a/src/plugins/qmakeprojectmanager/profilehighlighter.h
+++ b/src/plugins/qmakeprojectmanager/profilehighlighter.h
@@ -42,7 +42,7 @@ public:
         NumProfileFormats
     };
 
-    explicit ProFileHighlighter(const TextEditor::Keywords &keywords);
+    ProFileHighlighter();
     void highlightBlock(const QString &text);
 
 private:
diff --git a/src/plugins/qmakeprojectmanager/profilehoverhandler.cpp b/src/plugins/qmakeprojectmanager/profilehoverhandler.cpp
index 3c9c3962e83..dfbee9bb665 100644
--- a/src/plugins/qmakeprojectmanager/profilehoverhandler.cpp
+++ b/src/plugins/qmakeprojectmanager/profilehoverhandler.cpp
@@ -39,8 +39,8 @@ using namespace Core;
 namespace QmakeProjectManager {
 namespace Internal {
 
-ProFileHoverHandler::ProFileHoverHandler(const TextEditor::Keywords &keywords)
-    : m_keywords(keywords)
+ProFileHoverHandler::ProFileHoverHandler()
+    : m_keywords(qmakeKeywords())
 {
 }
 
diff --git a/src/plugins/qmakeprojectmanager/profilehoverhandler.h b/src/plugins/qmakeprojectmanager/profilehoverhandler.h
index 2fa1fb250e0..381329a93c3 100644
--- a/src/plugins/qmakeprojectmanager/profilehoverhandler.h
+++ b/src/plugins/qmakeprojectmanager/profilehoverhandler.h
@@ -38,7 +38,7 @@ namespace Internal {
 class ProFileHoverHandler : public TextEditor::BaseHoverHandler
 {
 public:
-    explicit ProFileHoverHandler(const TextEditor::Keywords &keywords);
+    ProFileHoverHandler();
 
 private:
     void identifyMatch(TextEditor::TextEditorWidget *editorWidget, int pos) override;
diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
index 3aa1c2c1fd7..9a5f55cd195 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
@@ -140,9 +140,9 @@ void SelectionTool::hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
         }
 
         if ((topSelectedItemIsMovable(itemList) && !view()->hasSingleSelectedModelNode())
-                || selectedItemCursorInMovableArea(event->scenePos())
+                || (selectedItemCursorInMovableArea(event->scenePos())
                 && !event->modifiers().testFlag(Qt::ControlModifier)
-                && !event->modifiers().testFlag(Qt::ShiftModifier)) {
+                && !event->modifiers().testFlag(Qt::ShiftModifier))) {
             view()->changeToMoveTool();
             return;
         }
diff --git a/src/plugins/qmldesigner/components/integration/designdocument.h b/src/plugins/qmldesigner/components/integration/designdocument.h
index ad110bfca4c..e4048dae26f 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.h
+++ b/src/plugins/qmldesigner/components/integration/designdocument.h
@@ -23,8 +23,7 @@
 **
 ****************************************************************************/
 
-#ifndef DesignDocument_h
-#define DesignDocument_h
+#pragma once
 
 #include <model.h>
 #include <rewriterview.h>
@@ -155,6 +154,3 @@ private: // variables
 };
 
 } // namespace QmlDesigner
-
-
-#endif // DesignDocument_h
diff --git a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
index f49d98e1f24..f446297a66d 100644
--- a/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
+++ b/src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
@@ -23,8 +23,7 @@
 **
 ****************************************************************************/
 
-#ifndef StackedUtilityPanelController_h
-#define StackedUtilityPanelController_h
+#pragma once
 
 #include "utilitypanelcontroller.h"
 
@@ -55,5 +54,3 @@ private:
 };
 
 } // namespace QmlDesigner
-
-#endif // StackedUtilityPanelController_h
diff --git a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h
index 6a2c33cfdf6..8718a83a04f 100644
--- a/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h
+++ b/src/plugins/qmldesigner/components/integration/utilitypanelcontroller.h
@@ -23,8 +23,7 @@
 **
 ****************************************************************************/
 
-#ifndef UtilityPanelController_h
-#define UtilityPanelController_h
+#pragma once
 
 #include <QObject>
 
@@ -47,5 +46,3 @@ protected:
 };
 
 } // namespace QmlDesigner
-
-#endif // UtilityPanelController_h
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
index e73c55629f2..643df70c451 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
@@ -23,8 +23,7 @@
 **
 ****************************************************************************/
 
-#ifndef QmlAnchorBindingProxy_h
-#define QmlAnchorBindingProxy_h
+#pragma once
 
 #include <QObject>
 #include <modelnode.h>
@@ -248,6 +247,3 @@ private:
 
 } // namespace Internal
 } // namespace QmlDesigner
-
-
-#endif //QmlAnchorBindingProxy
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
index 13b7af54881..d2d906e6657 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
@@ -95,7 +95,7 @@ void MetaInfoReader::elementStart(const QString &name)
     case ParsingHints:
     case Finished:
     case Undefined: setParserState(Error);
-        addError(tr("Illegal state while parsing"), currentSourceLocation());
+        addError(tr("Illegal state while parsing."), currentSourceLocation());
     case Error:
     default: return;
     }
@@ -113,7 +113,7 @@ void MetaInfoReader::elementEnd()
     case ParsingDocument:
     case Finished:
     case Undefined: setParserState(Error);
-        addError(tr("Illegal state while parsing"), currentSourceLocation());
+        addError(tr("Illegal state while parsing."), currentSourceLocation());
     case Error:
     default: return;
     }
@@ -126,12 +126,12 @@ void MetaInfoReader::propertyDefinition(const QString &name, const QVariant &val
     case ParsingItemLibrary: readItemLibraryEntryProperty(name, value); break;
     case ParsingProperty: readPropertyProperty(name, value); break;
     case ParsingQmlSource: readQmlSourceProperty(name, value); break;
-    case ParsingMetaInfo: addError(tr("No property definition allowed"), currentSourceLocation()); break;
+    case ParsingMetaInfo: addError(tr("No property definition allowed."), currentSourceLocation()); break;
     case ParsingDocument:
     case ParsingHints: readHint(name, value); break;
     case Finished:
     case Undefined: setParserState(Error);
-        addError(tr("Illegal state while parsing"), currentSourceLocation());
+        addError(tr("Illegal state while parsing."), currentSourceLocation());
     case Error:
     default: return;
     }
diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
index 3954d209171..6904417759f 100644
--- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
+++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.cpp
@@ -66,7 +66,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p)
             p.failed = true;
             p.errorMessage = QCoreApplication::translate("WidgetPluginManager",
                                                          "Failed to create instance of file "
-                                                         "'%1': %2").arg(p.path).arg(p.errorMessage);
+                                                         "\"%1\": %2").arg(p.path).arg(p.errorMessage);
             qWarning() << p.errorMessage;
             return 0;
         }
@@ -74,7 +74,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p)
         if (!object) {
             p.failed = true;
             p.errorMessage = QCoreApplication::translate("WidgetPluginManager",
-                                                         "Failed to create instance of file '%1'."
+                                                         "Failed to create instance of file \"%1\"."
                                                          ).arg(p.path);
             qWarning() << p.errorMessage;
             return 0;
@@ -83,7 +83,7 @@ static IWidgetPlugin *instance(WidgetPluginData &p)
         if (!iplugin) {
             p.failed = true;
             p.errorMessage = QCoreApplication::translate("WidgetPluginManager",
-                                                         "File '%1' is not a QmlDesigner plugin."
+                                                         "File \"%1\" is not a Qt Quick Designer plugin."
                                                          ).arg(p.path);
             qWarning() << p.errorMessage;
             delete object;
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs
index 828142b47f3..9f040daf760 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.qbs
+++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs
@@ -397,6 +397,7 @@ Project {
                 "componentcore/selectioncontext.h",
                 "componentcore/qmldesignericonprovider.cpp",
                 "componentcore/qmldesignericonprovider.h",
+                "componentcore/componentcore.qrc",
                 "texteditor/texteditorstatusbar.cpp",
                 "texteditor/texteditorstatusbar.h",
                 "componentcore/changestyleaction.cpp",
diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp
index 613066de365..a19c37e3af3 100644
--- a/src/plugins/silversearcher/findinfilessilversearcher.cpp
+++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp
@@ -146,7 +146,7 @@ FindInFilesSilverSearcher::FindInFilesSilverSearcher()
     if (!isEnabled()) {
         auto layout = new QHBoxLayout(m_widget);
         layout->setMargin(0);
-        QLabel *label = new QLabel(tr("SilverSearcher is not available on system"));
+        QLabel *label = new QLabel(tr("Silver Searcher is not available on the system."));
         label->setStyleSheet("QLabel { color : red; }");
         layout->addWidget(label);
     }
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index a501ee6518e..7486cfd0d42 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -589,7 +589,7 @@ CountingLabel::CountingLabel()
 
 void CountingLabel::updateCount(int count)
 {
-    setText(BaseFileFind::tr("%n found", nullptr, count));
+    setText(BaseFileFind::tr("%n found.", nullptr, count));
 }
 
 } // namespace Internal
diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
index 3c2ff5a1fc5..25553033cd5 100644
--- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
+++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
@@ -31,6 +31,7 @@
 #include <texteditor/codeassist/genericproposalmodel.h>
 #include <texteditor/completionsettings.h>
 #include <texteditor/texteditorsettings.h>
+#include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditor.h>
 
 #include <utils/algorithm.h>
@@ -243,4 +244,22 @@ KeywordsCompletionAssistProcessor::generateProposalList(const QStringList &words
     });
 }
 
+KeywordsCompletionAssistProvider::KeywordsCompletionAssistProvider(const Keywords &keyWords,
+                                                                   const QString &snippetGroup)
+    : m_keyWords(keyWords)
+    , m_snippetGroup(snippetGroup)
+{ }
+
+IAssistProvider::RunType KeywordsCompletionAssistProvider::runType() const
+{
+    return Synchronous;
+}
+
+IAssistProcessor *KeywordsCompletionAssistProvider::createProcessor() const
+{
+    auto processor = new KeywordsCompletionAssistProcessor(m_keyWords);
+    processor->setSnippetGroup(m_snippetGroup);
+    return processor;
+}
+
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.h b/src/plugins/texteditor/codeassist/keywordscompletionassist.h
index f65e726022a..c726dc42df4 100644
--- a/src/plugins/texteditor/codeassist/keywordscompletionassist.h
+++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.h
@@ -28,8 +28,11 @@
 #include "iassistprocessor.h"
 #include "assistproposalitem.h"
 #include "ifunctionhintproposalmodel.h"
+#include "completionassistprovider.h"
 #include "../snippets/snippetassistcollector.h"
 
+#include "texteditor/texteditorconstants.h"
+
 namespace TextEditor {
 
 class AssistInterface;
@@ -38,8 +41,8 @@ class TEXTEDITOR_EXPORT Keywords
 {
 public:
     Keywords() = default;
-    Keywords(const QStringList &variables, const QStringList &functions,
-             const QMap<QString, QStringList> &functionArgs);
+    Keywords(const QStringList &variables, const QStringList &functions = QStringList(),
+             const QMap<QString, QStringList> &functionArgs = QMap<QString, QStringList>());
     bool isVariable(const QString &word) const;
     bool isFunction(const QString &word) const;
 
@@ -79,6 +82,21 @@ private:
     QStringList m_functionSymbols;
 };
 
+class TEXTEDITOR_EXPORT KeywordsCompletionAssistProvider : public CompletionAssistProvider
+{
+public:
+    KeywordsCompletionAssistProvider(const Keywords &keyWords = Keywords(),
+            const QString &snippetGroup = QString(Constants::TEXT_SNIPPET_GROUP_ID));
+
+    // IAssistProvider interface
+    RunType runType() const override;
+    IAssistProcessor *createProcessor() const override;
+
+private:
+    Keywords m_keyWords;
+    QString m_snippetGroup;
+};
+
 class TEXTEDITOR_EXPORT KeywordsCompletionAssistProcessor : public IAssistProcessor
 {
 public:
diff --git a/src/plugins/texteditor/displaysettings.cpp b/src/plugins/texteditor/displaysettings.cpp
index 3d2eb5c084f..410283a7f6e 100644
--- a/src/plugins/texteditor/displaysettings.cpp
+++ b/src/plugins/texteditor/displaysettings.cpp
@@ -25,6 +25,12 @@
 
 #include "displaysettings.h"
 
+#include "texteditorconstants.h"
+
+#include <coreplugin/icore.h>
+#include <utils/tooltip/tooltip.h>
+
+#include <QLabel>
 #include <QSettings>
 #include <QString>
 
@@ -131,7 +137,17 @@ bool DisplaySettings::equals(const DisplaySettings &ds) const
         && m_displayAnnotations == ds.m_displayAnnotations
         && m_annotationAlignment == ds.m_annotationAlignment
         && m_minimalAnnotationContent == ds.m_minimalAnnotationContent
-        ;
+            ;
+}
+
+QLabel *DisplaySettings::createAnnotationSettingsLink()
+{
+    auto *label = new QLabel("<i><a href>Annotation Settings</a></i>", Core::ICore::mainWindow());
+    QObject::connect(label, &QLabel::linkActivated, []() {
+        Utils::ToolTip::hideImmediately();
+        Core::ICore::showOptionsDialog(Constants::TEXT_EDITOR_DISPLAY_SETTINGS);
+    });
+    return label;
 }
 
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/displaysettings.h b/src/plugins/texteditor/displaysettings.h
index 326f9aad069..41cebc0c6a3 100644
--- a/src/plugins/texteditor/displaysettings.h
+++ b/src/plugins/texteditor/displaysettings.h
@@ -31,6 +31,7 @@
 
 QT_BEGIN_NAMESPACE
 class QSettings;
+class QLabel;
 QT_END_NAMESPACE
 
 namespace TextEditor {
@@ -72,6 +73,8 @@ public:
     int m_minimalAnnotationContent = 15;
 
     bool equals(const DisplaySettings &ds) const;
+
+    static QLabel *createAnnotationSettingsLink();
 };
 
 inline bool operator==(const DisplaySettings &t1, const DisplaySettings &t2) { return t1.equals(t2); }
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index c7554dd677f..5325e973ba4 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -46,6 +46,7 @@
 #include "tabsettings.h"
 #include "textdocument.h"
 #include "textdocumentlayout.h"
+#include "texteditorconstants.h"
 #include "texteditoroverlay.h"
 #include "refactoroverlay.h"
 #include "texteditorsettings.h"
@@ -56,6 +57,7 @@
 #include <texteditor/codeassist/assistinterface.h>
 #include <texteditor/codeassist/codeassistant.h>
 #include <texteditor/codeassist/completionassistprovider.h>
+#include <texteditor/codeassist/keywordscompletionassist.h>
 #include <texteditor/generichighlighter/context.h>
 #include <texteditor/generichighlighter/highlightdefinition.h>
 #include <texteditor/generichighlighter/highlighter.h>
@@ -3291,30 +3293,32 @@ bool TextEditorWidgetPrivate::processAnnotaionTooltipRequest(const QTextBlock &b
         return false;
 
     for (const AnnotationRect &annotationRect : m_annotationRects[block.blockNumber()]) {
-        if (annotationRect.rect.contains(pos)) {
-            auto layout = new QGridLayout;
-            layout->setContentsMargins(0, 0, 0, 0);
-            layout->setSpacing(2);
-            annotationRect.mark->addToToolTipLayout(layout);
-            TextMarks marks = blockUserData->marks();
-            if (marks.size() > 1) {
-                QFrame* separator = new QFrame();
-                separator->setFrameShape(QFrame::HLine);
-                layout->addWidget(separator, 2, 0, 1, layout->columnCount());
-                layout->addWidget(new QLabel(tr("Other annotations:")), 3, 0, 1,
-                                  layout->columnCount());
-
-                Utils::sort(marks, [](const TextMark* mark1, const TextMark* mark2){
-                    return mark1->priority() > mark2->priority();
-                });
-                for (const TextMark *mark : Utils::asConst(marks)) {
-                    if (mark != annotationRect.mark)
-                        mark->addToToolTipLayout(layout);
-                }
+        if (!annotationRect.rect.contains(pos))
+            continue;
+
+        auto layout = new QGridLayout;
+        layout->setContentsMargins(0, 0, 0, 0);
+        layout->setSpacing(2);
+        annotationRect.mark->addToToolTipLayout(layout);
+        TextMarks marks = blockUserData->marks();
+        if (marks.size() > 1) {
+            QFrame* separator = new QFrame();
+            separator->setFrameShape(QFrame::HLine);
+            layout->addWidget(separator, layout->rowCount(), 0, 1, -1);
+            layout->addWidget(new QLabel(tr("Other annotations:")), layout->rowCount(), 0, 1, -1);
+
+            Utils::sort(marks, [](const TextMark* mark1, const TextMark* mark2){
+                return mark1->priority() > mark2->priority();
+            });
+            for (const TextMark *mark : Utils::asConst(marks)) {
+                if (mark != annotationRect.mark)
+                    mark->addToToolTipLayout(layout);
             }
-            ToolTip::show(q->mapToGlobal(pos), layout, q);
-            return true;
         }
+        layout->addWidget(DisplaySettings::createAnnotationSettingsLink(),
+                          layout->rowCount(), 0, 1, -1, Qt::AlignRight);
+        ToolTip::show(q->mapToGlobal(pos), layout, q);
+        return true;
     }
     return false;
 }
@@ -8136,13 +8140,7 @@ public:
     TextEditorFactoryPrivate(TextEditorFactory *parent) :
         q(parent),
         m_widgetCreator([]() { return new TextEditorWidget; }),
-        m_editorCreator([]() { return new BaseTextEditor; }),
-        m_completionAssistProvider(0),
-        m_useGenericHighlighter(false),
-        m_duplicatedSupported(true),
-        m_codeFoldingSupported(false),
-        m_paranthesesMatchinEnabled(false),
-        m_marksVisible(false)
+        m_editorCreator([]() { return new BaseTextEditor; })
     {}
 
     BaseTextEditor *duplicateTextEditor(BaseTextEditor *other)
@@ -8163,12 +8161,12 @@ public:
     TextEditorFactory::SyntaxHighLighterCreator m_syntaxHighlighterCreator;
     CommentDefinition m_commentDefinition;
     QList<BaseHoverHandler *> m_hoverHandlers; // owned
-    CompletionAssistProvider * m_completionAssistProvider; // owned
-    bool m_useGenericHighlighter;
-    bool m_duplicatedSupported;
-    bool m_codeFoldingSupported;
-    bool m_paranthesesMatchinEnabled;
-    bool m_marksVisible;
+    CompletionAssistProvider * m_completionAssistProvider = nullptr; // owned
+    bool m_useGenericHighlighter = false;
+    bool m_duplicatedSupported = true;
+    bool m_codeFoldingSupported = false;
+    bool m_paranthesesMatchinEnabled = false;
+    bool m_marksVisible = false;
 };
 
 } /// namespace Internal
@@ -8266,6 +8264,7 @@ void TextEditorFactory::setParenthesesMatchingEnabled(bool on)
 
 IEditor *TextEditorFactory::createEditor()
 {
+    static KeywordsCompletionAssistProvider basicSnippetProvider;
     TextDocumentPtr doc(d->m_documentCreator());
 
     if (d->m_indenterCreator)
@@ -8274,7 +8273,8 @@ IEditor *TextEditorFactory::createEditor()
     if (d->m_syntaxHighlighterCreator)
         doc->setSyntaxHighlighter(d->m_syntaxHighlighterCreator());
 
-    doc->setCompletionAssistProvider(d->m_completionAssistProvider);
+    doc->setCompletionAssistProvider(d->m_completionAssistProvider ? d->m_completionAssistProvider
+                                                                   : &basicSnippetProvider);
 
     return d->createEditorHelper(doc);
 }
diff --git a/src/share/3rdparty/generic-highlighter/alert.xml b/src/share/3rdparty/generic-highlighter/alert.xml
index 942983ac371..ec881f15032 100644
--- a/src/share/3rdparty/generic-highlighter/alert.xml
+++ b/src/share/3rdparty/generic-highlighter/alert.xml
@@ -1,68 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<!--
-  This file is part of KDE's kate project.
-
-  copyright   : (C) 2004 by Dominik Haumann
-  email       : dhdev at gmx dot de
-
- **********************************************************************
- * This library is free software; you can redistribute it and/or      *
- * modify it under the terms of the GNU Library General Public        *
- * License as published by the Free Software Foundation; either       *
- * version 2 of the License, or (at your option) any later version.   *
- *                                                                    *
- * This library is distributed in the hope that it will be useful,    *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of     *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  *
- * Library General Public License for more details.                   *
- *                                                                    *
- * You should have received a copy of the GNU Library General Public  *
- * License along with this library; if not, write to the              *
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,   *
- * Boston, MA  02110-1301, USA.                                       *
- **********************************************************************
-
- This file is included in every file that highlights the "alerts" keywords.
- That's why extensions and mimetype are empty.
-
- Changes by Alex Turbov:
-  Introduce 3 alert levels and sort keywords according importance.
-  Few more keywords has been added.
--->
-<language version="3" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPLv2+" hidden="true">
+<language version="5" kateversion="3.1" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhaumann@kde.org)" license="MIT" hidden="true">
   <highlighting>
     <list name="alerts_hi">
-      <item> ALERT </item>
-      <item> ATTENTION </item>
-      <item> DANGER </item>
-      <item> HACK </item>
-      <item> SECURITY </item>
+      <item>ALERT</item>
+      <item>ATTENTION</item>
+      <item>DANGER</item>
+      <item>HACK</item>
+      <item>SECURITY</item>
     </list>
     <list name="alerts_mid">
-      <item> BUG </item>
-      <item> FIXME </item>
-      <item> DEPRECATED </item>
-      <item> TASK </item>
-      <item> TODO </item>
-      <item> TBD </item>
-      <item> WARNING </item>
-      <item> CAUTION </item>
-      <item> NOLINT </item>
+      <item>BUG</item>
+      <item>FIXME</item>
+      <item>DEPRECATED</item>
+      <item>TASK</item>
+      <item>TODO</item>
+      <item>TBD</item>
+      <item>WARNING</item>
+      <item>CAUTION</item>
+      <item>NOLINT</item>
     </list>
     <list name="alerts_lo">
-      <item> ### </item>
-      <item> NOTE </item>
-      <item> NOTICE </item>
-      <item> TEST </item>
-      <item> TESTING </item>
+      <item>###</item>
+      <item>NOTE</item>
+      <item>NOTICE</item>
+      <item>TEST</item>
+      <item>TESTING</item>
     </list>
     <contexts>
       <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" >
         <StringDetect attribute="Region Marker" context="#stay" String="{{{" beginRegion="AlertRegion1" />
         <StringDetect attribute="Region Marker" context="#stay" String="}}}" endRegion="AlertRegion1" />
-        <StringDetect attribute="Region Marker" context="#stay" String="BEGIN" beginRegion="AlertRegion2" />
-        <StringDetect attribute="Region Marker" context="#stay" String="END" endRegion="AlertRegion2" />
+        <WordDetect attribute="Region Marker" context="#stay" String="BEGIN" beginRegion="AlertRegion2" />
+        <WordDetect attribute="Region Marker" context="#stay" String="END" endRegion="AlertRegion2" />
         <keyword attribute="Alert Level 1" context="#stay" String="alerts_hi" />
         <keyword attribute="Alert Level 2" context="#stay" String="alerts_mid" />
         <keyword attribute="Alert Level 3" context="#stay" String="alerts_lo" />
diff --git a/src/share/3rdparty/generic-highlighter/bash.xml b/src/share/3rdparty/generic-highlighter/bash.xml
index dc47e04bdfb..2e362f9e5cf 100644
--- a/src/share/3rdparty/generic-highlighter/bash.xml
+++ b/src/share/3rdparty/generic-highlighter/bash.xml
@@ -8,7 +8,7 @@
         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
 ]>
-<language name="Bash" version="3" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="4" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile" 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)
@@ -18,440 +18,440 @@
 
   <highlighting>
     <list name="keywords">
-      <item> else </item>
-      <item> for </item>
-      <item> function </item>
-      <item> in </item>
-      <item> select </item>
-      <item> until </item>
-      <item> while </item>
-      <item> elif </item>
-      <item> then </item>
-      <item> set </item>
+      <item>else</item>
+      <item>for</item>
+      <item>function</item>
+      <item>in</item>
+      <item>select</item>
+      <item>until</item>
+      <item>while</item>
+      <item>elif</item>
+      <item>then</item>
+      <item>set</item>
     </list>
 
     <list name="builtins">
-      <item> : </item>
-      <item> source </item>
-      <item> alias </item>
-      <item> bg </item>
-      <item> bind </item>
-      <item> break </item>
-      <item> builtin </item>
-      <item> cd </item>
-      <item> caller </item>
-      <item> command </item>
-      <item> compgen </item>
-      <item> complete </item>
-      <item> continue </item>
-      <item> dirs </item>
-      <item> disown </item>
-      <item> echo </item>
-      <item> enable </item>
-      <item> eval </item>
-      <item> exec </item>
-      <item> exit </item>
-      <item> fc </item>
-      <item> fg </item>
-      <item> getopts </item>
-      <item> hash </item>
-      <item> help </item>
-      <item> history </item>
-      <item> jobs </item>
-      <item> kill </item>
-      <item> let </item>
-      <item> logout </item>
-      <item> popd </item>
-      <item> printf </item>
-      <item> pushd </item>
-      <item> pwd </item>
-      <item> return </item>
-      <item> set </item>
-      <item> shift </item>
-      <item> shopt </item>
-      <item> suspend </item>
-      <item> test </item>
-      <item> time </item>
-      <item> times </item>
-      <item> trap </item>
-      <item> type </item>
-      <item> ulimit </item>
-      <item> umask </item>
-      <item> unalias </item>
-      <item> wait </item>
+      <item>:</item>
+      <item>source</item>
+      <item>alias</item>
+      <item>bg</item>
+      <item>bind</item>
+      <item>break</item>
+      <item>builtin</item>
+      <item>cd</item>
+      <item>caller</item>
+      <item>command</item>
+      <item>compgen</item>
+      <item>complete</item>
+      <item>continue</item>
+      <item>dirs</item>
+      <item>disown</item>
+      <item>echo</item>
+      <item>enable</item>
+      <item>eval</item>
+      <item>exec</item>
+      <item>exit</item>
+      <item>fc</item>
+      <item>fg</item>
+      <item>getopts</item>
+      <item>hash</item>
+      <item>help</item>
+      <item>history</item>
+      <item>jobs</item>
+      <item>kill</item>
+      <item>let</item>
+      <item>logout</item>
+      <item>popd</item>
+      <item>printf</item>
+      <item>pushd</item>
+      <item>pwd</item>
+      <item>return</item>
+      <item>set</item>
+      <item>shift</item>
+      <item>shopt</item>
+      <item>suspend</item>
+      <item>test</item>
+      <item>time</item>
+      <item>times</item>
+      <item>trap</item>
+      <item>type</item>
+      <item>ulimit</item>
+      <item>umask</item>
+      <item>unalias</item>
+      <item>wait</item>
     </list>
 
     <list name="builtins_var">
-      <item> export </item>
-      <item> unset </item>
-      <item> declare </item>
-      <item> typeset </item>
-      <item> local </item>
-      <item> read </item>
-      <item> readonly </item>
+      <item>export</item>
+      <item>unset</item>
+      <item>declare</item>
+      <item>typeset</item>
+      <item>local</item>
+      <item>read</item>
+      <item>readonly</item>
     </list>
 
     <list name="unixcommands">
       <!-- /bin -->
-      <item> arch </item>
-      <item> awk </item>
-      <item> bash </item>
-      <item> bunzip2 </item>
-      <item> bzcat </item>
-      <item> bzcmp </item>
-      <item> bzdiff </item>
-      <item> bzegrep </item>
-      <item> bzfgrep </item>
-      <item> bzgrep </item>
-      <item> bzip2 </item>
-      <item> bzip2recover </item>
-      <item> bzless </item>
-      <item> bzmore </item>
-      <item> cat </item>
-      <item> chattr </item>
-      <item> chgrp </item>
-      <item> chmod </item>
-      <item> chown </item>
-      <item> chvt </item>
-      <item> cp </item>
-      <item> date </item>
-      <item> dd </item>
-      <item> deallocvt </item>
-      <item> df </item>
-      <item> dir </item>
-      <item> dircolors </item>
-      <item> dmesg </item>
-      <item> dnsdomainname </item>
-      <item> domainname </item>
-      <item> du </item>
-      <item> dumpkeys </item>
-      <item> echo </item>
-      <item> ed </item>
-      <item> egrep </item>
-      <item> false </item>
-      <item> fgconsole </item>
-      <item> fgrep </item>
-      <item> fuser </item>
-      <item> gawk </item>
-      <item> getkeycodes </item>
-      <item> gocr </item>
-      <item> grep </item>
-      <item> groff </item>
-      <item> groups </item>
-      <item> gunzip </item>
-      <item> gzexe </item>
-      <item> gzip </item>
-      <item> hostname </item>
-      <item> igawk </item>
-      <item> install </item>
-      <item> kbd_mode </item>
-      <item> kbdrate </item>
-      <item> killall </item>
-      <item> last </item>
-      <item> lastb </item>
-      <item> link </item>
-      <item> ln </item>
-      <item> loadkeys </item>
-      <item> loadunimap </item>
-      <item> login </item>
-      <item> ls </item>
-      <item> lsattr </item>
-      <item> lsmod </item>
-      <item> lsmod.old </item>
-      <item> lzcat </item>
-      <item> lzcmp </item>
-      <item> lzdiff </item>
-      <item> lzegrep </item>
-      <item> lzfgrep </item>
-      <item> lzgrep </item>
-      <item> lzless </item>
-      <item> lzcat </item>
-      <item> lzma </item>
-      <item> lzmainfo </item>
-      <item> lzmore </item>
-      <item> mapscrn </item>
-      <item> mesg </item>
-      <item> mkdir </item>
-      <item> mkfifo </item>
-      <item> mknod </item>
-      <item> mktemp </item>
-      <item> more </item>
-      <item> mount </item>
-      <item> mv </item>
-      <item> nano </item>
-      <item> netstat </item>
-      <item> nisdomainname </item>
-      <item> nroff </item>
-      <item> openvt </item>
-      <item> pgawk </item>
-      <item> pidof </item>
-      <item> ping </item>
-      <item> ps </item>
-      <item> pstree </item>
-      <item> pwd </item>
-      <item> rbash </item>
-      <item> readlink </item>
-      <item> red </item>
-      <item> resizecons </item>
-      <item> rm </item>
-      <item> rmdir </item>
-      <item> run-parts </item>
-      <item> sash </item>
-      <item> sed </item>
-      <item> setfont </item>
-      <item> setkeycodes </item>
-      <item> setleds </item>
-      <item> setmetamode </item>
-      <item> setserial </item>
-      <item> sh </item>
-      <item> showkey </item>
-      <item> shred </item>
-      <item> sleep </item>
-      <item> ssed </item>
-      <item> stat </item>
-      <item> stty </item>
-      <item> su </item>
-      <item> sync </item>
-      <item> tar </item>
-      <item> tempfile </item>
-      <item> touch </item>
-      <item> troff </item>
-      <item> true </item>
-      <item> umount </item>
-      <item> uname </item>
-      <item> unicode_start </item>
-      <item> unicode_stop </item>
-      <item> unlink </item>
-      <item> unlzma </item>
-      <item> unxz </item>
-      <item> utmpdump </item>
-      <item> uuidgen </item>
-      <item> vdir </item>
-      <item> wall </item>
-      <item> wc </item>
-      <item> xz </item>
-      <item> xzcat </item>
-      <item> ypdomainname </item>
-      <item> zcat </item>
-      <item> zcmp </item>
-      <item> zdiff </item>
-      <item> zegrep </item>
-      <item> zfgrep </item>
-      <item> zforce </item>
-      <item> zgrep </item>
-      <item> zless </item>
-      <item> zmore </item>
-      <item> znew </item>
-      <item> zsh </item>
+      <item>arch</item>
+      <item>awk</item>
+      <item>bash</item>
+      <item>bunzip2</item>
+      <item>bzcat</item>
+      <item>bzcmp</item>
+      <item>bzdiff</item>
+      <item>bzegrep</item>
+      <item>bzfgrep</item>
+      <item>bzgrep</item>
+      <item>bzip2</item>
+      <item>bzip2recover</item>
+      <item>bzless</item>
+      <item>bzmore</item>
+      <item>cat</item>
+      <item>chattr</item>
+      <item>chgrp</item>
+      <item>chmod</item>
+      <item>chown</item>
+      <item>chvt</item>
+      <item>cp</item>
+      <item>date</item>
+      <item>dd</item>
+      <item>deallocvt</item>
+      <item>df</item>
+      <item>dir</item>
+      <item>dircolors</item>
+      <item>dmesg</item>
+      <item>dnsdomainname</item>
+      <item>domainname</item>
+      <item>du</item>
+      <item>dumpkeys</item>
+      <item>echo</item>
+      <item>ed</item>
+      <item>egrep</item>
+      <item>false</item>
+      <item>fgconsole</item>
+      <item>fgrep</item>
+      <item>fuser</item>
+      <item>gawk</item>
+      <item>getkeycodes</item>
+      <item>gocr</item>
+      <item>grep</item>
+      <item>groff</item>
+      <item>groups</item>
+      <item>gunzip</item>
+      <item>gzexe</item>
+      <item>gzip</item>
+      <item>hostname</item>
+      <item>igawk</item>
+      <item>install</item>
+      <item>kbd_mode</item>
+      <item>kbdrate</item>
+      <item>killall</item>
+      <item>last</item>
+      <item>lastb</item>
+      <item>link</item>
+      <item>ln</item>
+      <item>loadkeys</item>
+      <item>loadunimap</item>
+      <item>login</item>
+      <item>ls</item>
+      <item>lsattr</item>
+      <item>lsmod</item>
+      <item>lsmod.old</item>
+      <item>lzcat</item>
+      <item>lzcmp</item>
+      <item>lzdiff</item>
+      <item>lzegrep</item>
+      <item>lzfgrep</item>
+      <item>lzgrep</item>
+      <item>lzless</item>
+      <item>lzcat</item>
+      <item>lzma</item>
+      <item>lzmainfo</item>
+      <item>lzmore</item>
+      <item>mapscrn</item>
+      <item>mesg</item>
+      <item>mkdir</item>
+      <item>mkfifo</item>
+      <item>mknod</item>
+      <item>mktemp</item>
+      <item>more</item>
+      <item>mount</item>
+      <item>mv</item>
+      <item>nano</item>
+      <item>netstat</item>
+      <item>nisdomainname</item>
+      <item>nroff</item>
+      <item>openvt</item>
+      <item>pgawk</item>
+      <item>pidof</item>
+      <item>ping</item>
+      <item>ps</item>
+      <item>pstree</item>
+      <item>pwd</item>
+      <item>rbash</item>
+      <item>readlink</item>
+      <item>red</item>
+      <item>resizecons</item>
+      <item>rm</item>
+      <item>rmdir</item>
+      <item>run-parts</item>
+      <item>sash</item>
+      <item>sed</item>
+      <item>setfont</item>
+      <item>setkeycodes</item>
+      <item>setleds</item>
+      <item>setmetamode</item>
+      <item>setserial</item>
+      <item>sh</item>
+      <item>showkey</item>
+      <item>shred</item>
+      <item>sleep</item>
+      <item>ssed</item>
+      <item>stat</item>
+      <item>stty</item>
+      <item>su</item>
+      <item>sync</item>
+      <item>tar</item>
+      <item>tempfile</item>
+      <item>touch</item>
+      <item>troff</item>
+      <item>true</item>
+      <item>umount</item>
+      <item>uname</item>
+      <item>unicode_start</item>
+      <item>unicode_stop</item>
+      <item>unlink</item>
+      <item>unlzma</item>
+      <item>unxz</item>
+      <item>utmpdump</item>
+      <item>uuidgen</item>
+      <item>vdir</item>
+      <item>wall</item>
+      <item>wc</item>
+      <item>xz</item>
+      <item>xzcat</item>
+      <item>ypdomainname</item>
+      <item>zcat</item>
+      <item>zcmp</item>
+      <item>zdiff</item>
+      <item>zegrep</item>
+      <item>zfgrep</item>
+      <item>zforce</item>
+      <item>zgrep</item>
+      <item>zless</item>
+      <item>zmore</item>
+      <item>znew</item>
+      <item>zsh</item>
 
       <!-- some from /usr/bin -->
-      <item> aclocal </item>
-      <item> aconnect </item>
-      <item> aplay </item>
-      <item> apm </item>
-      <item> apmsleep </item>
-      <item> apropos </item>
-      <item> ar </item>
-      <item> arecord </item>
-      <item> as </item>
-      <item> as86 </item>
-      <item> autoconf </item>
-      <item> autoheader </item>
-      <item> automake </item>
-      <item> awk </item>
-      <item> basename </item>
-      <item> bc </item>
-      <item> bison </item>
-      <item> c++ </item>
-      <item> cal </item>
-      <item> cat </item>
-      <item> cc </item>
-      <item> cdda2wav </item>
-      <item> cdparanoia </item>
-      <item> cdrdao </item>
-      <item> cd-read </item>
-      <item> cdrecord </item>
-      <item> chfn </item>
-      <item> chgrp </item>
-      <item> chmod </item>
-      <item> chown </item>
-      <item> chroot </item>
-      <item> chsh </item>
-      <item> clear </item>
-      <item> cmp </item>
-      <item> co </item>
-      <item> col </item>
-      <item> comm </item>
-      <item> cp </item>
-      <item> cpio </item>
-      <item> cpp </item>
-      <item> cut </item>
-      <item> dc </item>
-      <item> dd </item>
-      <item> df </item>
-      <item> diff </item>
-      <item> diff3 </item>
-      <item> dir </item>
-      <item> dircolors </item>
-      <item> directomatic </item>
-      <item> dirname </item>
-      <item> du </item>
-      <item> env </item>
-      <item> expr </item>
-      <item> fbset </item>
-      <item> file </item>
-      <item> find </item>
-      <item> flex </item>
-      <item> flex++ </item>
-      <item> fmt </item>
-      <item> free </item>
-      <item> ftp </item>
-      <item> funzip </item>
-      <item> fuser </item>
-      <item> g++ </item>
-      <item> gawk </item>
-      <item> gc </item>
-      <item> gcc </item>
-      <item> clang </item>
-      <item> valgrind </item>
-      <item> xdg-open </item>
-      <item> cmake </item>
-      <item> qmake </item>
-      <item> svn </item>
-      <item> git </item>
-      <item> rsync </item>
-      <item> gdb </item>
-      <item> getent </item>
-      <item> getopt </item>
-      <item> gettext </item>
-      <item> gettextize </item>
-      <item> gimp </item>
-      <item> gimp-remote </item>
-      <item> gimptool </item>
-      <item> gmake </item>
-      <item> gs </item>
-      <item> head </item>
-      <item> hexdump </item>
-      <item> id </item>
-      <item> install </item>
-      <item> join </item>
-      <item> kill </item>
-      <item> killall </item>
-      <item> ld </item>
-      <item> ld86 </item>
-      <item> ldd </item>
-      <item> less </item>
-      <item> lex </item>
-      <item> ln </item>
-      <item> locate </item>
-      <item> lockfile </item>
-      <item> logname </item>
-      <item> lp </item>
-      <item> lpr </item>
-      <item> ls </item>
-      <item> lynx </item>
-      <item> m4 </item>
-      <item> make </item>
-      <item> man </item>
-      <item> mkdir </item>
-      <item> mknod </item>
-      <item> msgfmt </item>
-      <item> mv </item>
-      <item> namei </item>
-      <item> nasm </item>
-      <item> nawk </item>
-      <item> nice </item>
-      <item> nl </item>
-      <item> nm </item>
-      <item> nm86 </item>
-      <item> nmap </item>
-      <item> nohup </item>
-      <item> nop </item>
-      <item> od </item>
-      <item> passwd </item>
-      <item> patch </item>
-      <item> pcregrep </item>
-      <item> pcretest </item>
-      <item> perl </item>
-      <item> perror </item>
-      <item> pidof </item>
-      <item> pr </item>
-      <item> printf </item>
-      <item> procmail </item>
-      <item> prune </item>
-      <item> ps2ascii </item>
-      <item> ps2epsi </item>
-      <item> ps2frag </item>
-      <item> ps2pdf </item>
-      <item> ps2ps </item>
-      <item> psbook </item>
-      <item> psmerge </item>
-      <item> psnup </item>
-      <item> psresize </item>
-      <item> psselect </item>
-      <item> pstops </item>
-      <item> rcs </item>
-      <item> rev </item>
-      <item> rm </item>
-      <item> scp </item>
-      <item> sed </item>
-      <item> seq </item>
-      <item> setterm </item>
-      <item> shred </item>
-      <item> size </item>
-      <item> size86 </item>
-      <item> skill </item>
-      <item> slogin </item>
-      <item> snice </item>
-      <item> sort </item>
-      <item> sox </item>
-      <item> split </item>
-      <item> ssh </item>
-      <item> ssh-add </item>
-      <item> ssh-agent </item>
-      <item> ssh-keygen </item>
-      <item> ssh-keyscan </item>
-      <item> stat </item>
-      <item> strings </item>
-      <item> strip </item>
-      <item> sudo </item>
-      <item> suidperl </item>
-      <item> sum </item>
-      <item> tac </item>
-      <item> tail </item>
-      <item> tee </item>
-      <item> test </item>
-      <item> tr </item>
-      <item> uniq </item>
-      <item> unlink </item>
-      <item> unzip </item>
-      <item> updatedb </item>
-      <item> updmap </item>
-      <item> uptime </item>
-      <item> users </item>
-      <item> vmstat </item>
-      <item> w </item>
-      <item> wc </item>
-      <item> wget </item>
-      <item> whatis </item>
-      <item> whereis </item>
-      <item> which </item>
-      <item> who </item>
-      <item> whoami </item>
-      <item> write </item>
-      <item> xargs </item>
-      <item> yacc </item>
-      <item> yes </item>
-      <item> zip </item>
-      <item> zsoelim </item>
+      <item>aclocal</item>
+      <item>aconnect</item>
+      <item>aplay</item>
+      <item>apm</item>
+      <item>apmsleep</item>
+      <item>apropos</item>
+      <item>ar</item>
+      <item>arecord</item>
+      <item>as</item>
+      <item>as86</item>
+      <item>autoconf</item>
+      <item>autoheader</item>
+      <item>automake</item>
+      <item>awk</item>
+      <item>basename</item>
+      <item>bc</item>
+      <item>bison</item>
+      <item>c++</item>
+      <item>cal</item>
+      <item>cat</item>
+      <item>cc</item>
+      <item>cdda2wav</item>
+      <item>cdparanoia</item>
+      <item>cdrdao</item>
+      <item>cd-read</item>
+      <item>cdrecord</item>
+      <item>chfn</item>
+      <item>chgrp</item>
+      <item>chmod</item>
+      <item>chown</item>
+      <item>chroot</item>
+      <item>chsh</item>
+      <item>clear</item>
+      <item>cmp</item>
+      <item>co</item>
+      <item>col</item>
+      <item>comm</item>
+      <item>cp</item>
+      <item>cpio</item>
+      <item>cpp</item>
+      <item>cut</item>
+      <item>dc</item>
+      <item>dd</item>
+      <item>df</item>
+      <item>diff</item>
+      <item>diff3</item>
+      <item>dir</item>
+      <item>dircolors</item>
+      <item>directomatic</item>
+      <item>dirname</item>
+      <item>du</item>
+      <item>env</item>
+      <item>expr</item>
+      <item>fbset</item>
+      <item>file</item>
+      <item>find</item>
+      <item>flex</item>
+      <item>flex++</item>
+      <item>fmt</item>
+      <item>free</item>
+      <item>ftp</item>
+      <item>funzip</item>
+      <item>fuser</item>
+      <item>g++</item>
+      <item>gawk</item>
+      <item>gc</item>
+      <item>gcc</item>
+      <item>clang</item>
+      <item>valgrind</item>
+      <item>xdg-open</item>
+      <item>cmake</item>
+      <item>qmake</item>
+      <item>svn</item>
+      <item>git</item>
+      <item>rsync</item>
+      <item>gdb</item>
+      <item>getent</item>
+      <item>getopt</item>
+      <item>gettext</item>
+      <item>gettextize</item>
+      <item>gimp</item>
+      <item>gimp-remote</item>
+      <item>gimptool</item>
+      <item>gmake</item>
+      <item>gs</item>
+      <item>head</item>
+      <item>hexdump</item>
+      <item>id</item>
+      <item>install</item>
+      <item>join</item>
+      <item>kill</item>
+      <item>killall</item>
+      <item>ld</item>
+      <item>ld86</item>
+      <item>ldd</item>
+      <item>less</item>
+      <item>lex</item>
+      <item>ln</item>
+      <item>locate</item>
+      <item>lockfile</item>
+      <item>logname</item>
+      <item>lp</item>
+      <item>lpr</item>
+      <item>ls</item>
+      <item>lynx</item>
+      <item>m4</item>
+      <item>make</item>
+      <item>man</item>
+      <item>mkdir</item>
+      <item>mknod</item>
+      <item>msgfmt</item>
+      <item>mv</item>
+      <item>namei</item>
+      <item>nasm</item>
+      <item>nawk</item>
+      <item>nice</item>
+      <item>nl</item>
+      <item>nm</item>
+      <item>nm86</item>
+      <item>nmap</item>
+      <item>nohup</item>
+      <item>nop</item>
+      <item>od</item>
+      <item>passwd</item>
+      <item>patch</item>
+      <item>pcregrep</item>
+      <item>pcretest</item>
+      <item>perl</item>
+      <item>perror</item>
+      <item>pidof</item>
+      <item>pr</item>
+      <item>printf</item>
+      <item>procmail</item>
+      <item>prune</item>
+      <item>ps2ascii</item>
+      <item>ps2epsi</item>
+      <item>ps2frag</item>
+      <item>ps2pdf</item>
+      <item>ps2ps</item>
+      <item>psbook</item>
+      <item>psmerge</item>
+      <item>psnup</item>
+      <item>psresize</item>
+      <item>psselect</item>
+      <item>pstops</item>
+      <item>rcs</item>
+      <item>rev</item>
+      <item>rm</item>
+      <item>scp</item>
+      <item>sed</item>
+      <item>seq</item>
+      <item>setterm</item>
+      <item>shred</item>
+      <item>size</item>
+      <item>size86</item>
+      <item>skill</item>
+      <item>slogin</item>
+      <item>snice</item>
+      <item>sort</item>
+      <item>sox</item>
+      <item>split</item>
+      <item>ssh</item>
+      <item>ssh-add</item>
+      <item>ssh-agent</item>
+      <item>ssh-keygen</item>
+      <item>ssh-keyscan</item>
+      <item>stat</item>
+      <item>strings</item>
+      <item>strip</item>
+      <item>sudo</item>
+      <item>suidperl</item>
+      <item>sum</item>
+      <item>tac</item>
+      <item>tail</item>
+      <item>tee</item>
+      <item>test</item>
+      <item>tr</item>
+      <item>uniq</item>
+      <item>unlink</item>
+      <item>unzip</item>
+      <item>updatedb</item>
+      <item>updmap</item>
+      <item>uptime</item>
+      <item>users</item>
+      <item>vmstat</item>
+      <item>w</item>
+      <item>wc</item>
+      <item>wget</item>
+      <item>whatis</item>
+      <item>whereis</item>
+      <item>which</item>
+      <item>who</item>
+      <item>whoami</item>
+      <item>write</item>
+      <item>xargs</item>
+      <item>yacc</item>
+      <item>yes</item>
+      <item>zip</item>
+      <item>zsoelim</item>
 
       <!-- others -->
-      <item> dcop </item>
-      <item> kdialog </item>
-      <item> kfile </item>
-      <item> xhost </item>
-      <item> xmodmap </item>
-      <item> xset </item>
+      <item>dcop</item>
+      <item>kdialog</item>
+      <item>kfile</item>
+      <item>xhost</item>
+      <item>xmodmap</item>
+      <item>xset</item>
     </list>
 
 
@@ -587,7 +587,8 @@
         <RegExpr attribute="Redirection" context="#stay" String="([0-9]*(&gt;{1,2}|&lt;)(&amp;[0-9]+-?)?|&amp;&gt;|&gt;&amp;|[0-9]*&lt;&gt;)" />
         <!-- handle &, &&, | and || -->
         <RegExpr attribute="Control" context="#pop" String="([|&amp;;])\1?" />
-        <RegExpr attribute="Option" context="#stay" String="-?-[a-z][A-Za-z0-9_-]*" />
+        <RegExpr attribute="Normal Text" context="#stay" String="[a-zA-Z_]+-[A-Za-z0-9_-]*" />
+        <RegExpr attribute="Option" context="#stay" String="-?-[a-zA-Z_][A-Za-z0-9_-]*" />
         <keyword attribute="Option" context="#stay" String="keywords" />
         <AnyChar String=")}" context="#pop" lookAhead="true"/>
       </context>
diff --git a/src/share/3rdparty/generic-highlighter/cmake.xml b/src/share/3rdparty/generic-highlighter/cmake.xml
index bfbdbeee569..c0a8cd3e2dd 100644
--- a/src/share/3rdparty/generic-highlighter/cmake.xml
+++ b/src/share/3rdparty/generic-highlighter/cmake.xml
@@ -42,1060 +42,1060 @@
     <!-- ATTENTION Do not change the list name! Or change a generation script accordingly -->
     <list name = "commands">
       <!-- generated list -->
-      <item> add_compile_options </item>
-      <item> add_custom_command </item>
-      <item> add_custom_target </item>
-      <item> add_definitions </item>
-      <item> add_dependencies </item>
-      <item> add_executable </item>
-      <item> add_library </item>
-      <item> add_subdirectory </item>
-      <item> add_test </item>
-      <item> aux_source_directory </item>
-      <item> break </item>
-      <item> build_command </item>
-      <item> build_name </item>
-      <item> cmake_host_system_information </item>
-      <item> cmake_minimum_required </item>
-      <item> cmake_policy </item>
-      <item> configure_file </item>
-      <item> continue </item>
-      <item> create_test_sourcelist </item>
-      <item> ctest_build </item>
-      <item> ctest_configure </item>
-      <item> ctest_coverage </item>
-      <item> ctest_empty_binary_directory </item>
-      <item> ctest_memcheck </item>
-      <item> ctest_read_custom_files </item>
-      <item> ctest_run_script </item>
-      <item> ctest_sleep </item>
-      <item> ctest_start </item>
-      <item> ctest_submit </item>
-      <item> ctest_test </item>
-      <item> ctest_update </item>
-      <item> ctest_upload </item>
-      <item> define_property </item>
-      <item> else </item>
-      <item> elseif </item>
-      <item> enable_language </item>
-      <item> enable_testing </item>
-      <item> endforeach </item>
-      <item> endfunction </item>
-      <item> endif </item>
-      <item> endmacro </item>
-      <item> endwhile </item>
-      <item> exec_program </item>
-      <item> execute_process </item>
-      <item> export </item>
-      <item> export_library_dependencies </item>
-      <item> file </item>
-      <item> find_file </item>
-      <item> find_library </item>
-      <item> find_package </item>
-      <item> find_path </item>
-      <item> find_program </item>
-      <item> fltk_wrap_ui </item>
-      <item> foreach </item>
-      <item> function </item>
-      <item> get_cmake_property </item>
-      <item> get_directory_property </item>
-      <item> get_filename_component </item>
-      <item> get_property </item>
-      <item> get_source_file_property </item>
-      <item> get_target_property </item>
-      <item> get_test_property </item>
-      <item> if </item>
-      <item> include </item>
-      <item> include_directories </item>
-      <item> include_external_msproject </item>
-      <item> include_regular_expression </item>
-      <item> install </item>
-      <item> install_files </item>
-      <item> install_programs </item>
-      <item> install_targets </item>
-      <item> link_directories </item>
-      <item> link_libraries </item>
-      <item> list </item>
-      <item> load_cache </item>
-      <item> load_command </item>
-      <item> macro </item>
-      <item> make_directory </item>
-      <item> mark_as_advanced </item>
-      <item> math </item>
-      <item> message </item>
-      <item> option </item>
-      <item> output_required_files </item>
-      <item> project </item>
-      <item> qt_wrap_cpp </item>
-      <item> qt_wrap_ui </item>
-      <item> remove </item>
-      <item> remove_definitions </item>
-      <item> return </item>
-      <item> separate_arguments </item>
-      <item> set </item>
-      <item> set_directory_properties </item>
-      <item> set_property </item>
-      <item> set_source_files_properties </item>
-      <item> set_target_properties </item>
-      <item> set_tests_properties </item>
-      <item> site_name </item>
-      <item> source_group </item>
-      <item> string </item>
-      <item> subdir_depends </item>
-      <item> subdirs </item>
-      <item> target_compile_definitions </item>
-      <item> target_compile_features </item>
-      <item> target_compile_options </item>
-      <item> target_include_directories </item>
-      <item> target_link_libraries </item>
-      <item> target_sources </item>
-      <item> try_compile </item>
-      <item> try_run </item>
-      <item> unset </item>
-      <item> use_mangled_mesa </item>
-      <item> utility_source </item>
-      <item> variable_requires </item>
-      <item> variable_watch </item>
-      <item> while </item>
-      <item> write_file </item>
+      <item>add_compile_options</item>
+      <item>add_custom_command</item>
+      <item>add_custom_target</item>
+      <item>add_definitions</item>
+      <item>add_dependencies</item>
+      <item>add_executable</item>
+      <item>add_library</item>
+      <item>add_subdirectory</item>
+      <item>add_test</item>
+      <item>aux_source_directory</item>
+      <item>break</item>
+      <item>build_command</item>
+      <item>build_name</item>
+      <item>cmake_host_system_information</item>
+      <item>cmake_minimum_required</item>
+      <item>cmake_policy</item>
+      <item>configure_file</item>
+      <item>continue</item>
+      <item>create_test_sourcelist</item>
+      <item>ctest_build</item>
+      <item>ctest_configure</item>
+      <item>ctest_coverage</item>
+      <item>ctest_empty_binary_directory</item>
+      <item>ctest_memcheck</item>
+      <item>ctest_read_custom_files</item>
+      <item>ctest_run_script</item>
+      <item>ctest_sleep</item>
+      <item>ctest_start</item>
+      <item>ctest_submit</item>
+      <item>ctest_test</item>
+      <item>ctest_update</item>
+      <item>ctest_upload</item>
+      <item>define_property</item>
+      <item>else</item>
+      <item>elseif</item>
+      <item>enable_language</item>
+      <item>enable_testing</item>
+      <item>endforeach</item>
+      <item>endfunction</item>
+      <item>endif</item>
+      <item>endmacro</item>
+      <item>endwhile</item>
+      <item>exec_program</item>
+      <item>execute_process</item>
+      <item>export</item>
+      <item>export_library_dependencies</item>
+      <item>file</item>
+      <item>find_file</item>
+      <item>find_library</item>
+      <item>find_package</item>
+      <item>find_path</item>
+      <item>find_program</item>
+      <item>fltk_wrap_ui</item>
+      <item>foreach</item>
+      <item>function</item>
+      <item>get_cmake_property</item>
+      <item>get_directory_property</item>
+      <item>get_filename_component</item>
+      <item>get_property</item>
+      <item>get_source_file_property</item>
+      <item>get_target_property</item>
+      <item>get_test_property</item>
+      <item>if</item>
+      <item>include</item>
+      <item>include_directories</item>
+      <item>include_external_msproject</item>
+      <item>include_regular_expression</item>
+      <item>install</item>
+      <item>install_files</item>
+      <item>install_programs</item>
+      <item>install_targets</item>
+      <item>link_directories</item>
+      <item>link_libraries</item>
+      <item>list</item>
+      <item>load_cache</item>
+      <item>load_command</item>
+      <item>macro</item>
+      <item>make_directory</item>
+      <item>mark_as_advanced</item>
+      <item>math</item>
+      <item>message</item>
+      <item>option</item>
+      <item>output_required_files</item>
+      <item>project</item>
+      <item>qt_wrap_cpp</item>
+      <item>qt_wrap_ui</item>
+      <item>remove</item>
+      <item>remove_definitions</item>
+      <item>return</item>
+      <item>separate_arguments</item>
+      <item>set</item>
+      <item>set_directory_properties</item>
+      <item>set_property</item>
+      <item>set_source_files_properties</item>
+      <item>set_target_properties</item>
+      <item>set_tests_properties</item>
+      <item>site_name</item>
+      <item>source_group</item>
+      <item>string</item>
+      <item>subdir_depends</item>
+      <item>subdirs</item>
+      <item>target_compile_definitions</item>
+      <item>target_compile_features</item>
+      <item>target_compile_options</item>
+      <item>target_include_directories</item>
+      <item>target_link_libraries</item>
+      <item>target_sources</item>
+      <item>try_compile</item>
+      <item>try_run</item>
+      <item>unset</item>
+      <item>use_mangled_mesa</item>
+      <item>utility_source</item>
+      <item>variable_requires</item>
+      <item>variable_watch</item>
+      <item>while</item>
+      <item>write_file</item>
     </list>
 
     <list name="itkvtk_commands">
-      <item> itk_wrap_tcl </item>
-      <item> vtk_make_instantiator </item>
-      <item> vtk_wrap_java </item>
-      <item> vtk_wrap_python </item>
-      <item> vtk_wrap_tcl </item>
+      <item>itk_wrap_tcl</item>
+      <item>vtk_make_instantiator</item>
+      <item>vtk_wrap_java</item>
+      <item>vtk_wrap_python</item>
+      <item>vtk_wrap_tcl</item>
     </list>
 
     <!-- ATTENTION Do not change the list name! Or change a generation script accordingly -->
     <list name="special_args">
       <!-- generated list -->
-      <item> AFTER </item>
-      <item> ALIAS </item>
-      <item> ALL </item>
-      <item> ALPHABET </item>
-      <item> AND </item>
-      <item> APPEND </item>
-      <item> APPENDNUMBER_ERRORS </item>
-      <item> APPEND_STRING </item>
-      <item> ARCHIVE </item>
-      <item> ARGS </item>
-      <item> ASCII </item>
-      <item> AUTHOR_WARNING </item>
-      <item> BEFORE </item>
-      <item> BRIEF_DOCS </item>
-      <item> BUILD </item>
-      <item> BUNDLE </item>
-      <item> BYPRODUCTS </item>
-      <item> CACHE </item>
-      <item> CACHED_VARIABLE </item>
-      <item> CDASH_UPLOAD </item>
-      <item> CDASH_UPLOAD_TYPE </item>
-      <item> CLEAR </item>
-      <item> CMAKE_FIND_ROOT_PATH_BOTH </item>
-      <item> CMAKE_FLAGS </item>
-      <item> CODE </item>
-      <item> COMMAND </item>
-      <item> COMMAND_NAME </item>
-      <item> COMMENT </item>
-      <item> COMPARE </item>
-      <item> COMPILE_DEFINITIONS </item>
-      <item> COMPILE_OUTPUT_VARIABLE </item>
-      <item> COMPILE_RESULT_VAR </item>
-      <item> COMPONENT </item>
-      <item> COMPONENTS </item>
-      <item> CONCAT </item>
-      <item> CONDITION </item>
-      <item> CONFIG </item>
-      <item> CONFIGS </item>
-      <item> CONFIGURATION </item>
-      <item> CONFIGURATIONS </item>
-      <item> CONFIGURE </item>
-      <item> CONTENT </item>
-      <item> COPY </item>
-      <item> COPYONLY </item>
-      <item> COPY_FILE </item>
-      <item> COPY_FILE_ERROR </item>
-      <item> CRLF </item>
-      <item> DEFINED </item>
-      <item> DEFINITION </item>
-      <item> DEPENDS </item>
-      <item> DESTINATION </item>
-      <item> DIRECTORY </item>
-      <item> DIRECTORY_PERMISSIONS </item>
-      <item> DOC </item>
-      <item> DOS </item>
-      <item> DOWNLOAD </item>
-      <item> ENV </item>
-      <item> END </item>
-      <item> EQUAL </item>
-      <item> ERROR_FILE </item>
-      <item> ERROR_QUIET </item>
-      <item> ERROR_STRIP_TRAILING_WHITESPACE </item>
-      <item> ERROR_VARIABLE </item>
-      <item> ESCAPE_QUOTES </item>
-      <item> EXACT </item>
-      <item> EXCLUDE </item>
-      <item> EXCLUDE_FROM_ALL </item>
-      <item> EXCLUDE_LABEL </item>
-      <item> EXISTS </item>
-      <item> EXPECTED_HASH </item>
-      <item> EXPECTED_MD5 </item>
-      <item> EXPORT </item>
-      <item> EXPORT_LINK_INTERFACE_LIBRARIES </item>
-      <item> EXPR </item>
-      <item> EXTRA_INCLUDE </item>
-      <item> FATAL_ERROR </item>
-      <item> FILE </item>
-      <item> FILES </item>
-      <item> FILES_MATCHING </item>
-      <item> FILE_PERMISSIONS </item>
-      <item> FIND </item>
-      <item> FLAGS </item>
-      <item> FOLLOW_SYMLINKS </item>
-      <item> FORCE </item>
-      <item> FRAMEWORK </item>
-      <item> FULL_DOCS </item>
-      <item> FUNCTION </item>
-      <item> GENERATE </item>
-      <item> GENEX_STRIP </item>
-      <item> GET </item>
-      <item> GLOB </item>
-      <item> GLOBAL </item>
-      <item> GLOB_RECURSE </item>
-      <item> GREATER </item>
-      <item> GROUP_EXECUTE </item>
-      <item> GROUP_READ </item>
-      <item> GUARD </item>
-      <item> GUID </item>
-      <item> HEX </item>
-      <item> HINTS </item>
-      <item> IMPLICIT_DEPENDS </item>
-      <item> IMPORTED </item>
-      <item> IN </item>
-      <item> INACTIVITY_TIMEOUT </item>
-      <item> INCLUDE </item>
-      <item> INCLUDES </item>
-      <item> INCLUDE_INTERNALS </item>
-      <item> INCLUDE_LABEL </item>
-      <item> INHERITED </item>
-      <item> INPUT </item>
-      <item> INPUT_FILE </item>
-      <item> INSERT </item>
-      <item> INSTALL </item>
-      <item> INTERFACE </item>
-      <item> IS_ABSOLUTE </item>
-      <item> IS_DIRECTORY </item>
-      <item> IS_NEWER_THAN </item>
-      <item> IS_SYMLINK </item>
-      <item> ITEMS </item>
-      <item> LABELS </item>
-      <item> LANGUAGES </item>
-      <item> LENGTH </item>
-      <item> LENGTH_MAXIMUM </item>
-      <item> LENGTH_MINIMUM </item>
-      <item> LESS </item>
-      <item> LF </item>
-      <item> LIBRARY </item>
-      <item> LIMIT </item>
-      <item> LIMIT_COUNT </item>
-      <item> LIMIT_INPUT </item>
-      <item> LIMIT_OUTPUT </item>
-      <item> LINK_INTERFACE_LIBRARIES </item>
-      <item> LINK_LIBRARIES </item>
-      <item> LINK_PRIVATE </item>
-      <item> LINK_PUBLIC </item>
-      <item> LISTS </item>
-      <item> LIST_DIRECTORIES </item>
-      <item> LOCK </item>
-      <item> LOG </item>
-      <item> MACOSX_BUNDLE </item>
-      <item> MAIN_DEPENDENCY </item>
-      <item> MAKE_C_IDENTIFIER </item>
-      <item> MAKE_DIRECTORY </item>
-      <item> MATCH </item>
-      <item> MATCHALL </item>
-      <item> MATCHES </item>
-      <item> MD5 </item>
-      <item> MESSAGE_NEVER </item>
-      <item> MODULE </item>
-      <item> NAME </item>
-      <item> NAMELINK_ONLY </item>
-      <item> NAMELINK_SKIP </item>
-      <item> NAMES </item>
-      <item> NAMESPACE </item>
-      <item> NAMES_PER_DIR </item>
-      <item> NEW </item>
-      <item> NEWLINE_CONSUME </item>
-      <item> NEWLINE_STYLE </item>
-      <item> NEW_PROCESS </item>
-      <item> NOT </item>
-      <item> NOTEQUAL </item>
-      <item> NO_CMAKE_BUILDS_PATH </item>
-      <item> NO_CMAKE_ENVIRONMENT_PATH </item>
-      <item> NO_CMAKE_FIND_ROOT_PATH </item>
-      <item> NO_CMAKE_PACKAGE_REGISTRY </item>
-      <item> NO_CMAKE_PATH </item>
-      <item> NO_CMAKE_SYSTEM_PACKAGE_REGISTRY </item>
-      <item> NO_CMAKE_SYSTEM_PATH </item>
-      <item> NO_DEFAULT_PATH </item>
-      <item> NO_HEX_CONVERSION </item>
-      <item> NO_MODULE </item>
-      <item> NO_POLICY_SCOPE </item>
-      <item> NO_SOURCE_PERMISSIONS </item>
-      <item> NO_SYSTEM_ENVIRONMENT_PATH </item>
-      <item> NUMBER_ERRORS </item>
-      <item> NUMBER_WARNINGS </item>
-      <item> OBJECT </item>
-      <item> OFF </item>
-      <item> OFFSET </item>
-      <item> OLD </item>
-      <item> ON </item>
-      <item> ONLY_CMAKE_FIND_ROOT_PATH </item>
-      <item> OPTIONAL </item>
-      <item> OPTIONAL_COMPONENTS </item>
-      <item> OPTIONS </item>
-      <item> OR </item>
-      <item> OUTPUT </item>
-      <item> OUTPUT_DIRECTORY </item>
-      <item> OUTPUT_FILE </item>
-      <item> OUTPUT_QUIET </item>
-      <item> OUTPUT_STRIP_TRAILING_WHITESPACE </item>
-      <item> OUTPUT_VARIABLE </item>
-      <item> OWNER_EXECUTE </item>
-      <item> OWNER_READ </item>
-      <item> OWNER_WRITE </item>
-      <item> PACKAGE </item>
-      <item> PARALLEL_LEVEL </item>
-      <item> PARENT_SCOPE </item>
-      <item> PARTS </item>
-      <item> PATHS </item>
-      <item> PATH_SUFFIXES </item>
-      <item> PATH_TO_MESA </item>
-      <item> PATTERN </item>
-      <item> PERMISSIONS </item>
-      <item> PLATFORM </item>
-      <item> POLICY </item>
-      <item> POP </item>
-      <item> POST_BUILD </item>
-      <item> PREORDER </item>
-      <item> PRE_BUILD </item>
-      <item> PRE_LINK </item>
-      <item> PRIVATE </item>
-      <item> PRIVATE_HEADER </item>
-      <item> PROCESS </item>
-      <item> PROGRAM </item>
-      <item> PROGRAMS </item>
-      <item> PROGRAM_ARGS </item>
-      <item> PROJECT_NAME </item>
-      <item> PROPERTIES </item>
-      <item> PROPERTY </item>
-      <item> PUBLIC </item>
-      <item> PUBLIC_HEADER </item>
-      <item> PUSH </item>
-      <item> QUERY </item>
-      <item> QUIET </item>
-      <item> RANDOM </item>
-      <item> RANDOM_SEED </item>
-      <item> RANGE </item>
-      <item> READ </item>
-      <item> READ_WITH_PREFIX </item>
-      <item> REGEX </item>
-      <item> REGULAR_EXPRESSION </item>
-      <item> RELATIVE </item>
-      <item> RELATIVE_PATH </item>
-      <item> RELEASE </item>
-      <item> REMOVE </item>
-      <item> REMOVE_AT </item>
-      <item> REMOVE_DUPLICATES </item>
-      <item> REMOVE_ITEM </item>
-      <item> REMOVE_RECURSE </item>
-      <item> RENAME </item>
-      <item> REPLACE </item>
-      <item> REQUIRED </item>
-      <item> REQUIRED_VARIABLE1 </item>
-      <item> REQUIRED_VARIABLE2 </item>
-      <item> RESOURCE </item>
-      <item> RESULT </item>
-      <item> RESULT_VAR </item>
-      <item> RESULT_VARIABLE </item>
-      <item> RETRY_COUNT </item>
-      <item> RETRY_DELAY </item>
-      <item> RETURN_VALUE </item>
-      <item> REVERSE </item>
-      <item> RUNTIME </item>
-      <item> RUNTIME_DIRECTORY </item>
-      <item> RUN_OUTPUT_VARIABLE </item>
-      <item> RUN_RESULT_VAR </item>
-      <item> SCHEDULE_RANDOM </item>
-      <item> SCRIPT </item>
-      <item> SEND_ERROR </item>
-      <item> SET </item>
-      <item> SHA1 </item>
-      <item> SHA224 </item>
-      <item> SHA256 </item>
-      <item> SHA384 </item>
-      <item> SHA512 </item>
-      <item> SHARED </item>
-      <item> SHOW_PROGRESS </item>
-      <item> SORT </item>
-      <item> SOURCE </item>
-      <item> SOURCES </item>
-      <item> START </item>
-      <item> STATIC </item>
-      <item> STATUS </item>
-      <item> STREQUAL </item>
-      <item> STRGREATER </item>
-      <item> STOP_TIME </item>
-      <item> STRIDE </item>
-      <item> STRINGS </item>
-      <item> STRIP </item>
-      <item> STRLESS </item>
-      <item> SUBSTRING </item>
-      <item> SYSTEM </item>
-      <item> TARGET </item>
-      <item> TARGETS </item>
-      <item> TEST </item>
-      <item> TEST_VARIABLE </item>
-      <item> TIMEOUT </item>
-      <item> TIMESTAMP </item>
-      <item> TLS_CAINFO </item>
-      <item> TLS_VERIFY </item>
-      <item> TOLOWER </item>
-      <item> TOUPPER </item>
-      <item> TO_CMAKE_PATH </item>
-      <item> TO_NATIVE_PATH </item>
-      <item> TRACK </item>
-      <item> TYPE </item>
-      <item> UNIX </item>
-      <item> UNIX_COMMAND </item>
-      <item> UNKNOWN </item>
-      <item> UPLOAD </item>
-      <item> UPPER </item>
-      <item> USES_TERMINAL </item>
-      <item> USE_SOURCE_PERMISSIONS </item>
-      <item> UTC </item>
-      <item> UUID </item>
-      <item> VALUE </item>
-      <item> VARIABLE </item>
-      <item> VERBATIM </item>
-      <item> VERSION </item>
-      <item> VERSION_EQUAL </item>
-      <item> VERSION_GREATER </item>
-      <item> VERSION_LESS </item>
-      <item> WARNING </item>
-      <item> WIN32 </item>
-      <item> WINDOWS_COMMAND </item>
-      <item> WORKING_DIRECTORY </item>
-      <item> WRITE </item>
+      <item>AFTER</item>
+      <item>ALIAS</item>
+      <item>ALL</item>
+      <item>ALPHABET</item>
+      <item>AND</item>
+      <item>APPEND</item>
+      <item>APPENDNUMBER_ERRORS</item>
+      <item>APPEND_STRING</item>
+      <item>ARCHIVE</item>
+      <item>ARGS</item>
+      <item>ASCII</item>
+      <item>AUTHOR_WARNING</item>
+      <item>BEFORE</item>
+      <item>BRIEF_DOCS</item>
+      <item>BUILD</item>
+      <item>BUNDLE</item>
+      <item>BYPRODUCTS</item>
+      <item>CACHE</item>
+      <item>CACHED_VARIABLE</item>
+      <item>CDASH_UPLOAD</item>
+      <item>CDASH_UPLOAD_TYPE</item>
+      <item>CLEAR</item>
+      <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
+      <item>CMAKE_FLAGS</item>
+      <item>CODE</item>
+      <item>COMMAND</item>
+      <item>COMMAND_NAME</item>
+      <item>COMMENT</item>
+      <item>COMPARE</item>
+      <item>COMPILE_DEFINITIONS</item>
+      <item>COMPILE_OUTPUT_VARIABLE</item>
+      <item>COMPILE_RESULT_VAR</item>
+      <item>COMPONENT</item>
+      <item>COMPONENTS</item>
+      <item>CONCAT</item>
+      <item>CONDITION</item>
+      <item>CONFIG</item>
+      <item>CONFIGS</item>
+      <item>CONFIGURATION</item>
+      <item>CONFIGURATIONS</item>
+      <item>CONFIGURE</item>
+      <item>CONTENT</item>
+      <item>COPY</item>
+      <item>COPYONLY</item>
+      <item>COPY_FILE</item>
+      <item>COPY_FILE_ERROR</item>
+      <item>CRLF</item>
+      <item>DEFINED</item>
+      <item>DEFINITION</item>
+      <item>DEPENDS</item>
+      <item>DESTINATION</item>
+      <item>DIRECTORY</item>
+      <item>DIRECTORY_PERMISSIONS</item>
+      <item>DOC</item>
+      <item>DOS</item>
+      <item>DOWNLOAD</item>
+      <item>ENV</item>
+      <item>END</item>
+      <item>EQUAL</item>
+      <item>ERROR_FILE</item>
+      <item>ERROR_QUIET</item>
+      <item>ERROR_STRIP_TRAILING_WHITESPACE</item>
+      <item>ERROR_VARIABLE</item>
+      <item>ESCAPE_QUOTES</item>
+      <item>EXACT</item>
+      <item>EXCLUDE</item>
+      <item>EXCLUDE_FROM_ALL</item>
+      <item>EXCLUDE_LABEL</item>
+      <item>EXISTS</item>
+      <item>EXPECTED_HASH</item>
+      <item>EXPECTED_MD5</item>
+      <item>EXPORT</item>
+      <item>EXPORT_LINK_INTERFACE_LIBRARIES</item>
+      <item>EXPR</item>
+      <item>EXTRA_INCLUDE</item>
+      <item>FATAL_ERROR</item>
+      <item>FILE</item>
+      <item>FILES</item>
+      <item>FILES_MATCHING</item>
+      <item>FILE_PERMISSIONS</item>
+      <item>FIND</item>
+      <item>FLAGS</item>
+      <item>FOLLOW_SYMLINKS</item>
+      <item>FORCE</item>
+      <item>FRAMEWORK</item>
+      <item>FULL_DOCS</item>
+      <item>FUNCTION</item>
+      <item>GENERATE</item>
+      <item>GENEX_STRIP</item>
+      <item>GET</item>
+      <item>GLOB</item>
+      <item>GLOBAL</item>
+      <item>GLOB_RECURSE</item>
+      <item>GREATER</item>
+      <item>GROUP_EXECUTE</item>
+      <item>GROUP_READ</item>
+      <item>GUARD</item>
+      <item>GUID</item>
+      <item>HEX</item>
+      <item>HINTS</item>
+      <item>IMPLICIT_DEPENDS</item>
+      <item>IMPORTED</item>
+      <item>IN</item>
+      <item>INACTIVITY_TIMEOUT</item>
+      <item>INCLUDE</item>
+      <item>INCLUDES</item>
+      <item>INCLUDE_INTERNALS</item>
+      <item>INCLUDE_LABEL</item>
+      <item>INHERITED</item>
+      <item>INPUT</item>
+      <item>INPUT_FILE</item>
+      <item>INSERT</item>
+      <item>INSTALL</item>
+      <item>INTERFACE</item>
+      <item>IS_ABSOLUTE</item>
+      <item>IS_DIRECTORY</item>
+      <item>IS_NEWER_THAN</item>
+      <item>IS_SYMLINK</item>
+      <item>ITEMS</item>
+      <item>LABELS</item>
+      <item>LANGUAGES</item>
+      <item>LENGTH</item>
+      <item>LENGTH_MAXIMUM</item>
+      <item>LENGTH_MINIMUM</item>
+      <item>LESS</item>
+      <item>LF</item>
+      <item>LIBRARY</item>
+      <item>LIMIT</item>
+      <item>LIMIT_COUNT</item>
+      <item>LIMIT_INPUT</item>
+      <item>LIMIT_OUTPUT</item>
+      <item>LINK_INTERFACE_LIBRARIES</item>
+      <item>LINK_LIBRARIES</item>
+      <item>LINK_PRIVATE</item>
+      <item>LINK_PUBLIC</item>
+      <item>LISTS</item>
+      <item>LIST_DIRECTORIES</item>
+      <item>LOCK</item>
+      <item>LOG</item>
+      <item>MACOSX_BUNDLE</item>
+      <item>MAIN_DEPENDENCY</item>
+      <item>MAKE_C_IDENTIFIER</item>
+      <item>MAKE_DIRECTORY</item>
+      <item>MATCH</item>
+      <item>MATCHALL</item>
+      <item>MATCHES</item>
+      <item>MD5</item>
+      <item>MESSAGE_NEVER</item>
+      <item>MODULE</item>
+      <item>NAME</item>
+      <item>NAMELINK_ONLY</item>
+      <item>NAMELINK_SKIP</item>
+      <item>NAMES</item>
+      <item>NAMESPACE</item>
+      <item>NAMES_PER_DIR</item>
+      <item>NEW</item>
+      <item>NEWLINE_CONSUME</item>
+      <item>NEWLINE_STYLE</item>
+      <item>NEW_PROCESS</item>
+      <item>NOT</item>
+      <item>NOTEQUAL</item>
+      <item>NO_CMAKE_BUILDS_PATH</item>
+      <item>NO_CMAKE_ENVIRONMENT_PATH</item>
+      <item>NO_CMAKE_FIND_ROOT_PATH</item>
+      <item>NO_CMAKE_PACKAGE_REGISTRY</item>
+      <item>NO_CMAKE_PATH</item>
+      <item>NO_CMAKE_SYSTEM_PACKAGE_REGISTRY</item>
+      <item>NO_CMAKE_SYSTEM_PATH</item>
+      <item>NO_DEFAULT_PATH</item>
+      <item>NO_HEX_CONVERSION</item>
+      <item>NO_MODULE</item>
+      <item>NO_POLICY_SCOPE</item>
+      <item>NO_SOURCE_PERMISSIONS</item>
+      <item>NO_SYSTEM_ENVIRONMENT_PATH</item>
+      <item>NUMBER_ERRORS</item>
+      <item>NUMBER_WARNINGS</item>
+      <item>OBJECT</item>
+      <item>OFF</item>
+      <item>OFFSET</item>
+      <item>OLD</item>
+      <item>ON</item>
+      <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
+      <item>OPTIONAL</item>
+      <item>OPTIONAL_COMPONENTS</item>
+      <item>OPTIONS</item>
+      <item>OR</item>
+      <item>OUTPUT</item>
+      <item>OUTPUT_DIRECTORY</item>
+      <item>OUTPUT_FILE</item>
+      <item>OUTPUT_QUIET</item>
+      <item>OUTPUT_STRIP_TRAILING_WHITESPACE</item>
+      <item>OUTPUT_VARIABLE</item>
+      <item>OWNER_EXECUTE</item>
+      <item>OWNER_READ</item>
+      <item>OWNER_WRITE</item>
+      <item>PACKAGE</item>
+      <item>PARALLEL_LEVEL</item>
+      <item>PARENT_SCOPE</item>
+      <item>PARTS</item>
+      <item>PATHS</item>
+      <item>PATH_SUFFIXES</item>
+      <item>PATH_TO_MESA</item>
+      <item>PATTERN</item>
+      <item>PERMISSIONS</item>
+      <item>PLATFORM</item>
+      <item>POLICY</item>
+      <item>POP</item>
+      <item>POST_BUILD</item>
+      <item>PREORDER</item>
+      <item>PRE_BUILD</item>
+      <item>PRE_LINK</item>
+      <item>PRIVATE</item>
+      <item>PRIVATE_HEADER</item>
+      <item>PROCESS</item>
+      <item>PROGRAM</item>
+      <item>PROGRAMS</item>
+      <item>PROGRAM_ARGS</item>
+      <item>PROJECT_NAME</item>
+      <item>PROPERTIES</item>
+      <item>PROPERTY</item>
+      <item>PUBLIC</item>
+      <item>PUBLIC_HEADER</item>
+      <item>PUSH</item>
+      <item>QUERY</item>
+      <item>QUIET</item>
+      <item>RANDOM</item>
+      <item>RANDOM_SEED</item>
+      <item>RANGE</item>
+      <item>READ</item>
+      <item>READ_WITH_PREFIX</item>
+      <item>REGEX</item>
+      <item>REGULAR_EXPRESSION</item>
+      <item>RELATIVE</item>
+      <item>RELATIVE_PATH</item>
+      <item>RELEASE</item>
+      <item>REMOVE</item>
+      <item>REMOVE_AT</item>
+      <item>REMOVE_DUPLICATES</item>
+      <item>REMOVE_ITEM</item>
+      <item>REMOVE_RECURSE</item>
+      <item>RENAME</item>
+      <item>REPLACE</item>
+      <item>REQUIRED</item>
+      <item>REQUIRED_VARIABLE1</item>
+      <item>REQUIRED_VARIABLE2</item>
+      <item>RESOURCE</item>
+      <item>RESULT</item>
+      <item>RESULT_VAR</item>
+      <item>RESULT_VARIABLE</item>
+      <item>RETRY_COUNT</item>
+      <item>RETRY_DELAY</item>
+      <item>RETURN_VALUE</item>
+      <item>REVERSE</item>
+      <item>RUNTIME</item>
+      <item>RUNTIME_DIRECTORY</item>
+      <item>RUN_OUTPUT_VARIABLE</item>
+      <item>RUN_RESULT_VAR</item>
+      <item>SCHEDULE_RANDOM</item>
+      <item>SCRIPT</item>
+      <item>SEND_ERROR</item>
+      <item>SET</item>
+      <item>SHA1</item>
+      <item>SHA224</item>
+      <item>SHA256</item>
+      <item>SHA384</item>
+      <item>SHA512</item>
+      <item>SHARED</item>
+      <item>SHOW_PROGRESS</item>
+      <item>SORT</item>
+      <item>SOURCE</item>
+      <item>SOURCES</item>
+      <item>START</item>
+      <item>STATIC</item>
+      <item>STATUS</item>
+      <item>STREQUAL</item>
+      <item>STRGREATER</item>
+      <item>STOP_TIME</item>
+      <item>STRIDE</item>
+      <item>STRINGS</item>
+      <item>STRIP</item>
+      <item>STRLESS</item>
+      <item>SUBSTRING</item>
+      <item>SYSTEM</item>
+      <item>TARGET</item>
+      <item>TARGETS</item>
+      <item>TEST</item>
+      <item>TEST_VARIABLE</item>
+      <item>TIMEOUT</item>
+      <item>TIMESTAMP</item>
+      <item>TLS_CAINFO</item>
+      <item>TLS_VERIFY</item>
+      <item>TOLOWER</item>
+      <item>TOUPPER</item>
+      <item>TO_CMAKE_PATH</item>
+      <item>TO_NATIVE_PATH</item>
+      <item>TRACK</item>
+      <item>TYPE</item>
+      <item>UNIX</item>
+      <item>UNIX_COMMAND</item>
+      <item>UNKNOWN</item>
+      <item>UPLOAD</item>
+      <item>UPPER</item>
+      <item>USES_TERMINAL</item>
+      <item>USE_SOURCE_PERMISSIONS</item>
+      <item>UTC</item>
+      <item>UUID</item>
+      <item>VALUE</item>
+      <item>VARIABLE</item>
+      <item>VERBATIM</item>
+      <item>VERSION</item>
+      <item>VERSION_EQUAL</item>
+      <item>VERSION_GREATER</item>
+      <item>VERSION_LESS</item>
+      <item>WARNING</item>
+      <item>WIN32</item>
+      <item>WINDOWS_COMMAND</item>
+      <item>WORKING_DIRECTORY</item>
+      <item>WRITE</item>
     </list>
 
     <!-- these are "special" and don't show up in the generated lists -->
     <list name="extra_special_args">
       <!-- get_filename_component() has <COMP> placeholder for the following special args -->
-      <item> PATH </item>
-      <item> NAME </item>
-      <item> EXT </item>
-      <item> NAME_WE </item>
-      <item> ABSOLUTE </item>
-      <item> REALPATH </item>
+      <item>PATH</item>
+      <item>NAME</item>
+      <item>EXT</item>
+      <item>NAME_WE</item>
+      <item>ABSOLUTE</item>
+      <item>REALPATH</item>
       <!-- set() has <type> placeholder for the following special args -->
-      <item> FILEPATH </item>
+      <item>FILEPATH</item>
       <!-- PATH already present above -->
-      <item> STRING </item>
-      <item> BOOL </item>
-      <item> INTERNAL </item>
+      <item>STRING</item>
+      <item>BOOL</item>
+      <item>INTERNAL</item>
       <!-- key values to the QUERY parameter of cmake_host_system_information() -->
-      <item> NUMBER_OF_LOGICAL_CORES </item>
-      <item> NUMBER_OF_PHYSICAL_CORES </item>
-      <item> HOSTNAME </item>
-      <item> FQDN </item>
-      <item> TOTAL_VIRTUAL_MEMORY </item>
-      <item> AVAILABLE_VIRTUAL_MEMORY </item>
-      <item> TOTAL_PHYSICAL_MEMORY </item>
-      <item> AVAILABLE_PHYSICAL_MEMORY </item>
+      <item>NUMBER_OF_LOGICAL_CORES</item>
+      <item>NUMBER_OF_PHYSICAL_CORES</item>
+      <item>HOSTNAME</item>
+      <item>FQDN</item>
+      <item>TOTAL_VIRTUAL_MEMORY</item>
+      <item>AVAILABLE_VIRTUAL_MEMORY</item>
+      <item>TOTAL_PHYSICAL_MEMORY</item>
+      <item>AVAILABLE_PHYSICAL_MEMORY</item>
       <!-- Since CMake 3.3 -->
-      <item> IN_LIST </item>
+      <item>IN_LIST</item>
     </list>
 
     <!-- ATTENTION Do not change the list name! Or change a generation script accordingly -->
     <list name="properties">
       <!-- generated list -->
-      <item> ABSTRACT </item>
-      <item> ADDITIONAL_MAKE_CLEAN_FILES </item>
-      <item> ADVANCED </item>
-      <item> ALIASED_TARGET </item>
-      <item> ALLOW_DUPLICATE_CUSTOM_TARGETS </item>
-      <item> ANDROID_API </item>
-      <item> ANDROID_API_MIN </item>
-      <item> ANDROID_GUI </item>
-      <item> ARCHIVE_OUTPUT_DIRECTORY </item>
-      <item> ARCHIVE_OUTPUT_NAME </item>
-      <item> ATTACHED_FILES </item>
-      <item> ATTACHED_FILES_ON_FAIL </item>
-      <item> AUTOGEN_TARGETS_FOLDER </item>
-      <item> AUTOGEN_TARGET_DEPENDS </item>
-      <item> AUTOMOC </item>
-      <item> AUTOMOC_MOC_OPTIONS </item>
-      <item> AUTOMOC_TARGETS_FOLDER </item>
-      <item> AUTORCC </item>
-      <item> AUTORCC_OPTIONS </item>
-      <item> AUTOUIC </item>
-      <item> AUTOUIC_OPTIONS </item>
-      <item> BUILD_WITH_INSTALL_RPATH </item>
-      <item> BUNDLE </item>
-      <item> BUNDLE_EXTENSION </item>
-      <item> CACHE_VARIABLES </item>
-      <item> CLEAN_NO_CUSTOM </item>
-      <item> CMAKE_CONFIGURE_DEPENDS </item>
-      <item> CMAKE_CXX_KNOWN_FEATURES </item>
-      <item> CMAKE_C_KNOWN_FEATURES </item>
-      <item> COMPATIBLE_INTERFACE_BOOL </item>
-      <item> COMPATIBLE_INTERFACE_NUMBER_MAX </item>
-      <item> COMPATIBLE_INTERFACE_NUMBER_MIN </item>
-      <item> COMPATIBLE_INTERFACE_STRING </item>
-      <item> COMPILE_DEFINITIONS </item>
-      <item> COMPILE_FEATURES </item>
-      <item> COMPILE_FLAGS </item>
-      <item> COMPILE_OPTIONS </item>
-      <item> COMPILE_PDB_NAME </item>
-      <item> COMPILE_PDB_OUTPUT_DIRECTORY </item>
-      <item> COST </item>
-      <item> CPACK_DESKTOP_SHORTCUTS </item>
-      <item> CPACK_NEVER_OVERWRITE </item>
-      <item> CPACK_PERMANENT </item>
-      <item> CPACK_STARTUP_SHORTCUTS </item>
-      <item> CPACK_START_MENU_SHORTCUTS </item>
-      <item> CPACK_WIX_ACL </item>
-      <item> CROSSCOMPILING_EMULATOR </item>
-      <item> CXX_EXTENSIONS </item>
-      <item> CXX_STANDARD </item>
-      <item> CXX_STANDARD_REQUIRED </item>
-      <item> C_EXTENSIONS </item>
-      <item> C_STANDARD </item>
-      <item> C_STANDARD_REQUIRED </item>
-      <item> DEBUG_CONFIGURATIONS </item>
-      <item> DEBUG_POSTFIX </item>
-      <item> DEFINE_SYMBOL </item>
-      <item> DEFINITIONS </item>
-      <item> DEPENDS </item>
-      <item> DISABLED_FEATURES </item>
-      <item> ECLIPSE_EXTRA_NATURES </item>
-      <item> ENABLED_FEATURES </item>
-      <item> ENABLED_LANGUAGES </item>
-      <item> ENABLE_EXPORTS </item>
-      <item> ENVIRONMENT </item>
-      <item> EXCLUDE_FROM_ALL </item>
-      <item> EXCLUDE_FROM_DEFAULT_BUILD </item>
-      <item> EXPORT_NAME </item>
-      <item> EXTERNAL_OBJECT </item>
-      <item> EchoString </item>
-      <item> FAIL_REGULAR_EXPRESSION </item>
-      <item> FIND_LIBRARY_USE_LIB64_PATHS </item>
-      <item> FIND_LIBRARY_USE_OPENBSD_VERSIONING </item>
-      <item> FOLDER </item>
-      <item> FRAMEWORK </item>
-      <item> Fortran_FORMAT </item>
-      <item> Fortran_MODULE_DIRECTORY </item>
-      <item> GENERATED </item>
-      <item> GENERATOR_FILE_NAME </item>
-      <item> GLOBAL_DEPENDS_DEBUG_MODE </item>
-      <item> GLOBAL_DEPENDS_NO_CYCLES </item>
-      <item> GNUtoMS </item>
-      <item> HAS_CXX </item>
-      <item> HEADER_FILE_ONLY </item>
-      <item> HELPSTRING </item>
-      <item> IMPLICIT_DEPENDS_INCLUDE_TRANSFORM </item>
-      <item> IMPORTED </item>
-      <item> IMPORTED_CONFIGURATIONS </item>
-      <item> IMPORTED_IMPLIB </item>
-      <item> IMPORTED_LINK_DEPENDENT_LIBRARIES </item>
-      <item> IMPORTED_LINK_INTERFACE_LANGUAGES </item>
-      <item> IMPORTED_LINK_INTERFACE_LIBRARIES </item>
-      <item> IMPORTED_LINK_INTERFACE_MULTIPLICITY </item>
-      <item> IMPORTED_LOCATION </item>
-      <item> IMPORTED_NO_SONAME </item>
-      <item> IMPORTED_SONAME </item>
-      <item> IMPORT_PREFIX </item>
-      <item> IMPORT_SUFFIX </item>
-      <item> INCLUDE_DIRECTORIES </item>
-      <item> INCLUDE_REGULAR_EXPRESSION </item>
-      <item> INSTALL_NAME_DIR </item>
-      <item> INSTALL_RPATH </item>
-      <item> INSTALL_RPATH_USE_LINK_PATH </item>
-      <item> INTERFACE_AUTOUIC_OPTIONS </item>
-      <item> INTERFACE_COMPILE_DEFINITIONS </item>
-      <item> INTERFACE_COMPILE_FEATURES </item>
-      <item> INTERFACE_COMPILE_OPTIONS </item>
-      <item> INTERFACE_INCLUDE_DIRECTORIES </item>
-      <item> INTERFACE_LINK_LIBRARIES </item>
-      <item> INTERFACE_POSITION_INDEPENDENT_CODE </item>
-      <item> INTERFACE_SOURCES </item>
-      <item> INTERFACE_SYSTEM_INCLUDE_DIRECTORIES </item>
-      <item> INTERPROCEDURAL_OPTIMIZATION </item>
-      <item> IN_TRY_COMPILE </item>
-      <item> JOB_POOLS </item>
-      <item> JOB_POOL_COMPILE </item>
-      <item> JOB_POOL_LINK </item>
-      <item> KEEP_EXTENSION </item>
-      <item> LABELS </item>
-      <item> LANGUAGE </item>
-      <item> LIBRARY_OUTPUT_DIRECTORY </item>
-      <item> LIBRARY_OUTPUT_NAME </item>
-      <item> LINKER_LANGUAGE </item>
-      <item> LINK_DEPENDS </item>
-      <item> LINK_DEPENDS_NO_SHARED </item>
-      <item> LINK_DIRECTORIES </item>
-      <item> LINK_FLAGS </item>
-      <item> LINK_INTERFACE_LIBRARIES </item>
-      <item> LINK_INTERFACE_MULTIPLICITY </item>
-      <item> LINK_LIBRARIES </item>
-      <item> LINK_SEARCH_END_STATIC </item>
-      <item> LINK_SEARCH_START_STATIC </item>
-      <item> LISTFILE_STACK </item>
-      <item> LOCATION </item>
-      <item> MACOSX_BUNDLE </item>
-      <item> MACOSX_BUNDLE_INFO_PLIST </item>
-      <item> MACOSX_FRAMEWORK_INFO_PLIST </item>
-      <item> MACOSX_PACKAGE_LOCATION </item>
-      <item> MACOSX_RPATH </item>
-      <item> MACROS </item>
-      <item> MEASUREMENT </item>
-      <item> MODIFIED </item>
-      <item> NAME </item>
-      <item> NO_SONAME </item>
-      <item> NO_SYSTEM_FROM_IMPORTED </item>
-      <item> OBJECT_DEPENDS </item>
-      <item> OBJECT_OUTPUTS </item>
-      <item> OSX_ARCHITECTURES </item>
-      <item> OUTPUT_NAME </item>
-      <item> PACKAGES_FOUND </item>
-      <item> PACKAGES_NOT_FOUND </item>
-      <item> PARENT_DIRECTORY </item>
-      <item> PASS_REGULAR_EXPRESSION </item>
-      <item> PDB_NAME </item>
-      <item> PDB_OUTPUT_DIRECTORY </item>
-      <item> POSITION_INDEPENDENT_CODE </item>
-      <item> POST_INSTALL_SCRIPT </item>
-      <item> PREDEFINED_TARGETS_FOLDER </item>
-      <item> PREFIX </item>
-      <item> PRE_INSTALL_SCRIPT </item>
-      <item> PRIVATE_HEADER </item>
-      <item> PROCESSORS </item>
-      <item> PROJECT_LABEL </item>
-      <item> PUBLIC_HEADER </item>
-      <item> REPORT_UNDEFINED_PROPERTIES </item>
-      <item> REQUIRED_FILES </item>
-      <item> RESOURCE </item>
-      <item> RESOURCE_LOCK </item>
-      <item> RULE_LAUNCH_COMPILE </item>
-      <item> RULE_LAUNCH_CUSTOM </item>
-      <item> RULE_LAUNCH_LINK </item>
-      <item> RULE_MESSAGES </item>
-      <item> RUNTIME_OUTPUT_DIRECTORY </item>
-      <item> RUNTIME_OUTPUT_NAME </item>
-      <item> RUN_SERIAL </item>
-      <item> SKIP_BUILD_RPATH </item>
-      <item> SKIP_RETURN_CODE </item>
-      <item> SOURCES </item>
-      <item> SOVERSION </item>
-      <item> STATIC_LIBRARY_FLAGS </item>
-      <item> STRINGS </item>
-      <item> SUFFIX </item>
-      <item> SYMBOLIC </item>
-      <item> TARGET_ARCHIVES_MAY_BE_SHARED_LIBS </item>
-      <item> TARGET_SUPPORTS_SHARED_LIBS </item>
-      <item> TEST_INCLUDE_FILE </item>
-      <item> TIMEOUT </item>
-      <item> TYPE </item>
-      <item> USE_FOLDERS </item>
-      <item> VALUE </item>
-      <item> VARIABLES </item>
-      <item> VERSION </item>
-      <item> VISIBILITY_INLINES_HIDDEN </item>
-      <item> VS_DEPLOYMENT_CONTENT </item>
-      <item> VS_DEPLOYMENT_LOCATION </item>
-      <item> VS_DOTNET_REFERENCES </item>
-      <item> VS_DOTNET_TARGET_FRAMEWORK_VERSION </item>
-      <item> VS_GLOBAL_KEYWORD </item>
-      <item> VS_GLOBAL_PROJECT_TYPES </item>
-      <item> VS_GLOBAL_ROOTNAMESPACE </item>
-      <item> VS_KEYWORD </item>
-      <item> VS_SCC_AUXPATH </item>
-      <item> VS_SCC_LOCALPATH </item>
-      <item> VS_SCC_PROJECTNAME </item>
-      <item> VS_SCC_PROVIDER </item>
-      <item> VS_SHADER_ENTRYPOINT </item>
-      <item> VS_SHADER_FLAGS </item>
-      <item> VS_SHADER_MODEL </item>
-      <item> VS_SHADER_TYPE </item>
-      <item> VS_WINRT_COMPONENT </item>
-      <item> VS_WINRT_EXTENSIONS </item>
-      <item> VS_WINRT_REFERENCES </item>
-      <item> VS_XAML_TYPE </item>
-      <item> WILL_FAIL </item>
-      <item> WIN32_EXECUTABLE </item>
-      <item> WORKING_DIRECTORY </item>
-      <item> WRAP_EXCLUDE </item>
-      <item> XCODE_EXPLICIT_FILE_TYPE </item>
-      <item> XCODE_LAST_KNOWN_FILE_TYPE </item>
-      <item> XCTEST </item>
+      <item>ABSTRACT</item>
+      <item>ADDITIONAL_MAKE_CLEAN_FILES</item>
+      <item>ADVANCED</item>
+      <item>ALIASED_TARGET</item>
+      <item>ALLOW_DUPLICATE_CUSTOM_TARGETS</item>
+      <item>ANDROID_API</item>
+      <item>ANDROID_API_MIN</item>
+      <item>ANDROID_GUI</item>
+      <item>ARCHIVE_OUTPUT_DIRECTORY</item>
+      <item>ARCHIVE_OUTPUT_NAME</item>
+      <item>ATTACHED_FILES</item>
+      <item>ATTACHED_FILES_ON_FAIL</item>
+      <item>AUTOGEN_TARGETS_FOLDER</item>
+      <item>AUTOGEN_TARGET_DEPENDS</item>
+      <item>AUTOMOC</item>
+      <item>AUTOMOC_MOC_OPTIONS</item>
+      <item>AUTOMOC_TARGETS_FOLDER</item>
+      <item>AUTORCC</item>
+      <item>AUTORCC_OPTIONS</item>
+      <item>AUTOUIC</item>
+      <item>AUTOUIC_OPTIONS</item>
+      <item>BUILD_WITH_INSTALL_RPATH</item>
+      <item>BUNDLE</item>
+      <item>BUNDLE_EXTENSION</item>
+      <item>CACHE_VARIABLES</item>
+      <item>CLEAN_NO_CUSTOM</item>
+      <item>CMAKE_CONFIGURE_DEPENDS</item>
+      <item>CMAKE_CXX_KNOWN_FEATURES</item>
+      <item>CMAKE_C_KNOWN_FEATURES</item>
+      <item>COMPATIBLE_INTERFACE_BOOL</item>
+      <item>COMPATIBLE_INTERFACE_NUMBER_MAX</item>
+      <item>COMPATIBLE_INTERFACE_NUMBER_MIN</item>
+      <item>COMPATIBLE_INTERFACE_STRING</item>
+      <item>COMPILE_DEFINITIONS</item>
+      <item>COMPILE_FEATURES</item>
+      <item>COMPILE_FLAGS</item>
+      <item>COMPILE_OPTIONS</item>
+      <item>COMPILE_PDB_NAME</item>
+      <item>COMPILE_PDB_OUTPUT_DIRECTORY</item>
+      <item>COST</item>
+      <item>CPACK_DESKTOP_SHORTCUTS</item>
+      <item>CPACK_NEVER_OVERWRITE</item>
+      <item>CPACK_PERMANENT</item>
+      <item>CPACK_STARTUP_SHORTCUTS</item>
+      <item>CPACK_START_MENU_SHORTCUTS</item>
+      <item>CPACK_WIX_ACL</item>
+      <item>CROSSCOMPILING_EMULATOR</item>
+      <item>CXX_EXTENSIONS</item>
+      <item>CXX_STANDARD</item>
+      <item>CXX_STANDARD_REQUIRED</item>
+      <item>C_EXTENSIONS</item>
+      <item>C_STANDARD</item>
+      <item>C_STANDARD_REQUIRED</item>
+      <item>DEBUG_CONFIGURATIONS</item>
+      <item>DEBUG_POSTFIX</item>
+      <item>DEFINE_SYMBOL</item>
+      <item>DEFINITIONS</item>
+      <item>DEPENDS</item>
+      <item>DISABLED_FEATURES</item>
+      <item>ECLIPSE_EXTRA_NATURES</item>
+      <item>ENABLED_FEATURES</item>
+      <item>ENABLED_LANGUAGES</item>
+      <item>ENABLE_EXPORTS</item>
+      <item>ENVIRONMENT</item>
+      <item>EXCLUDE_FROM_ALL</item>
+      <item>EXCLUDE_FROM_DEFAULT_BUILD</item>
+      <item>EXPORT_NAME</item>
+      <item>EXTERNAL_OBJECT</item>
+      <item>EchoString</item>
+      <item>FAIL_REGULAR_EXPRESSION</item>
+      <item>FIND_LIBRARY_USE_LIB64_PATHS</item>
+      <item>FIND_LIBRARY_USE_OPENBSD_VERSIONING</item>
+      <item>FOLDER</item>
+      <item>FRAMEWORK</item>
+      <item>Fortran_FORMAT</item>
+      <item>Fortran_MODULE_DIRECTORY</item>
+      <item>GENERATED</item>
+      <item>GENERATOR_FILE_NAME</item>
+      <item>GLOBAL_DEPENDS_DEBUG_MODE</item>
+      <item>GLOBAL_DEPENDS_NO_CYCLES</item>
+      <item>GNUtoMS</item>
+      <item>HAS_CXX</item>
+      <item>HEADER_FILE_ONLY</item>
+      <item>HELPSTRING</item>
+      <item>IMPLICIT_DEPENDS_INCLUDE_TRANSFORM</item>
+      <item>IMPORTED</item>
+      <item>IMPORTED_CONFIGURATIONS</item>
+      <item>IMPORTED_IMPLIB</item>
+      <item>IMPORTED_LINK_DEPENDENT_LIBRARIES</item>
+      <item>IMPORTED_LINK_INTERFACE_LANGUAGES</item>
+      <item>IMPORTED_LINK_INTERFACE_LIBRARIES</item>
+      <item>IMPORTED_LINK_INTERFACE_MULTIPLICITY</item>
+      <item>IMPORTED_LOCATION</item>
+      <item>IMPORTED_NO_SONAME</item>
+      <item>IMPORTED_SONAME</item>
+      <item>IMPORT_PREFIX</item>
+      <item>IMPORT_SUFFIX</item>
+      <item>INCLUDE_DIRECTORIES</item>
+      <item>INCLUDE_REGULAR_EXPRESSION</item>
+      <item>INSTALL_NAME_DIR</item>
+      <item>INSTALL_RPATH</item>
+      <item>INSTALL_RPATH_USE_LINK_PATH</item>
+      <item>INTERFACE_AUTOUIC_OPTIONS</item>
+      <item>INTERFACE_COMPILE_DEFINITIONS</item>
+      <item>INTERFACE_COMPILE_FEATURES</item>
+      <item>INTERFACE_COMPILE_OPTIONS</item>
+      <item>INTERFACE_INCLUDE_DIRECTORIES</item>
+      <item>INTERFACE_LINK_LIBRARIES</item>
+      <item>INTERFACE_POSITION_INDEPENDENT_CODE</item>
+      <item>INTERFACE_SOURCES</item>
+      <item>INTERFACE_SYSTEM_INCLUDE_DIRECTORIES</item>
+      <item>INTERPROCEDURAL_OPTIMIZATION</item>
+      <item>IN_TRY_COMPILE</item>
+      <item>JOB_POOLS</item>
+      <item>JOB_POOL_COMPILE</item>
+      <item>JOB_POOL_LINK</item>
+      <item>KEEP_EXTENSION</item>
+      <item>LABELS</item>
+      <item>LANGUAGE</item>
+      <item>LIBRARY_OUTPUT_DIRECTORY</item>
+      <item>LIBRARY_OUTPUT_NAME</item>
+      <item>LINKER_LANGUAGE</item>
+      <item>LINK_DEPENDS</item>
+      <item>LINK_DEPENDS_NO_SHARED</item>
+      <item>LINK_DIRECTORIES</item>
+      <item>LINK_FLAGS</item>
+      <item>LINK_INTERFACE_LIBRARIES</item>
+      <item>LINK_INTERFACE_MULTIPLICITY</item>
+      <item>LINK_LIBRARIES</item>
+      <item>LINK_SEARCH_END_STATIC</item>
+      <item>LINK_SEARCH_START_STATIC</item>
+      <item>LISTFILE_STACK</item>
+      <item>LOCATION</item>
+      <item>MACOSX_BUNDLE</item>
+      <item>MACOSX_BUNDLE_INFO_PLIST</item>
+      <item>MACOSX_FRAMEWORK_INFO_PLIST</item>
+      <item>MACOSX_PACKAGE_LOCATION</item>
+      <item>MACOSX_RPATH</item>
+      <item>MACROS</item>
+      <item>MEASUREMENT</item>
+      <item>MODIFIED</item>
+      <item>NAME</item>
+      <item>NO_SONAME</item>
+      <item>NO_SYSTEM_FROM_IMPORTED</item>
+      <item>OBJECT_DEPENDS</item>
+      <item>OBJECT_OUTPUTS</item>
+      <item>OSX_ARCHITECTURES</item>
+      <item>OUTPUT_NAME</item>
+      <item>PACKAGES_FOUND</item>
+      <item>PACKAGES_NOT_FOUND</item>
+      <item>PARENT_DIRECTORY</item>
+      <item>PASS_REGULAR_EXPRESSION</item>
+      <item>PDB_NAME</item>
+      <item>PDB_OUTPUT_DIRECTORY</item>
+      <item>POSITION_INDEPENDENT_CODE</item>
+      <item>POST_INSTALL_SCRIPT</item>
+      <item>PREDEFINED_TARGETS_FOLDER</item>
+      <item>PREFIX</item>
+      <item>PRE_INSTALL_SCRIPT</item>
+      <item>PRIVATE_HEADER</item>
+      <item>PROCESSORS</item>
+      <item>PROJECT_LABEL</item>
+      <item>PUBLIC_HEADER</item>
+      <item>REPORT_UNDEFINED_PROPERTIES</item>
+      <item>REQUIRED_FILES</item>
+      <item>RESOURCE</item>
+      <item>RESOURCE_LOCK</item>
+      <item>RULE_LAUNCH_COMPILE</item>
+      <item>RULE_LAUNCH_CUSTOM</item>
+      <item>RULE_LAUNCH_LINK</item>
+      <item>RULE_MESSAGES</item>
+      <item>RUNTIME_OUTPUT_DIRECTORY</item>
+      <item>RUNTIME_OUTPUT_NAME</item>
+      <item>RUN_SERIAL</item>
+      <item>SKIP_BUILD_RPATH</item>
+      <item>SKIP_RETURN_CODE</item>
+      <item>SOURCES</item>
+      <item>SOVERSION</item>
+      <item>STATIC_LIBRARY_FLAGS</item>
+      <item>STRINGS</item>
+      <item>SUFFIX</item>
+      <item>SYMBOLIC</item>
+      <item>TARGET_ARCHIVES_MAY_BE_SHARED_LIBS</item>
+      <item>TARGET_SUPPORTS_SHARED_LIBS</item>
+      <item>TEST_INCLUDE_FILE</item>
+      <item>TIMEOUT</item>
+      <item>TYPE</item>
+      <item>USE_FOLDERS</item>
+      <item>VALUE</item>
+      <item>VARIABLES</item>
+      <item>VERSION</item>
+      <item>VISIBILITY_INLINES_HIDDEN</item>
+      <item>VS_DEPLOYMENT_CONTENT</item>
+      <item>VS_DEPLOYMENT_LOCATION</item>
+      <item>VS_DOTNET_REFERENCES</item>
+      <item>VS_DOTNET_TARGET_FRAMEWORK_VERSION</item>
+      <item>VS_GLOBAL_KEYWORD</item>
+      <item>VS_GLOBAL_PROJECT_TYPES</item>
+      <item>VS_GLOBAL_ROOTNAMESPACE</item>
+      <item>VS_KEYWORD</item>
+      <item>VS_SCC_AUXPATH</item>
+      <item>VS_SCC_LOCALPATH</item>
+      <item>VS_SCC_PROJECTNAME</item>
+      <item>VS_SCC_PROVIDER</item>
+      <item>VS_SHADER_ENTRYPOINT</item>
+      <item>VS_SHADER_FLAGS</item>
+      <item>VS_SHADER_MODEL</item>
+      <item>VS_SHADER_TYPE</item>
+      <item>VS_WINRT_COMPONENT</item>
+      <item>VS_WINRT_EXTENSIONS</item>
+      <item>VS_WINRT_REFERENCES</item>
+      <item>VS_XAML_TYPE</item>
+      <item>WILL_FAIL</item>
+      <item>WIN32_EXECUTABLE</item>
+      <item>WORKING_DIRECTORY</item>
+      <item>WRAP_EXCLUDE</item>
+      <item>XCODE_EXPLICIT_FILE_TYPE</item>
+      <item>XCODE_LAST_KNOWN_FILE_TYPE</item>
+      <item>XCTEST</item>
     </list>
 
     <!-- these are "special" and don't show up in the generated lists -->
     <list name="extra_properties">
-      <item> COMMANDS </item> <!-- WARNING: this one looks like a cmake bug, watch for it to migrate to the generated list! -->
-      <item> DEFINITION </item>
+      <item>COMMANDS</item> <!-- WARNING: this one looks like a cmake bug, watch for it to migrate to the generated list! -->
+      <item>DEFINITION</item>
     </list>
 
     <!-- ATTENTION Do not change the list name! Or change a generation script accordingly -->
     <list name="cmake_vars">
       <!-- generated list -->
-      <item> APPLE </item>
-      <item> BORLAND </item>
-      <item> BUILD_SHARED_LIBS </item>
-      <item> CMAKE_ABSOLUTE_DESTINATION_FILES </item>
-      <item> CMAKE_ANDROID_API </item>
-      <item> CMAKE_ANDROID_API_MIN </item>
-      <item> CMAKE_ANDROID_GUI </item>
-      <item> CMAKE_APPBUNDLE_PATH </item>
-      <item> CMAKE_AR </item>
-      <item> CMAKE_ARCHIVE_OUTPUT_DIRECTORY </item>
-      <item> CMAKE_ARGC </item>
-      <item> CMAKE_ARGV0 </item>
-      <item> CMAKE_AUTOMOC </item>
-      <item> CMAKE_AUTOMOC_MOC_OPTIONS </item>
-      <item> CMAKE_AUTOMOC_RELAXED_MODE </item>
-      <item> CMAKE_AUTORCC </item>
-      <item> CMAKE_AUTORCC_OPTIONS </item>
-      <item> CMAKE_AUTOUIC </item>
-      <item> CMAKE_AUTOUIC_OPTIONS </item>
-      <item> CMAKE_BACKWARDS_COMPATIBILITY </item>
-      <item> CMAKE_BINARY_DIR </item>
-      <item> CMAKE_BUILD_TOOL </item>
-      <item> CMAKE_BUILD_TYPE </item>
-      <item> CMAKE_BUILD_WITH_INSTALL_RPATH </item>
-      <item> CMAKE_CACHEFILE_DIR </item>
-      <item> CMAKE_CACHE_MAJOR_VERSION </item>
-      <item> CMAKE_CACHE_MINOR_VERSION </item>
-      <item> CMAKE_CACHE_PATCH_VERSION </item>
-      <item> CMAKE_CFG_INTDIR </item>
-      <item> CMAKE_CL_64 </item>
-      <item> CMAKE_COLOR_MAKEFILE </item>
-      <item> CMAKE_COMMAND </item>
-      <item> CMAKE_COMPILER_2005 </item>
-      <item> CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY </item>
-      <item> CMAKE_CONFIGURATION_TYPES </item>
-      <item> CMAKE_CROSSCOMPILING </item>
-      <item> CMAKE_CROSSCOMPILING_EMULATOR </item>
-      <item> CMAKE_CTEST_COMMAND </item>
-      <item> CMAKE_CURRENT_BINARY_DIR </item>
-      <item> CMAKE_CURRENT_LIST_DIR </item>
-      <item> CMAKE_CURRENT_LIST_FILE </item>
-      <item> CMAKE_CURRENT_LIST_LINE </item>
-      <item> CMAKE_CURRENT_SOURCE_DIR </item>
-      <item> CMAKE_CXX_COMPILE_FEATURES </item>
-      <item> CMAKE_CXX_EXTENSIONS </item>
-      <item> CMAKE_CXX_STANDARD </item>
-      <item> CMAKE_CXX_STANDARD_REQUIRED </item>
-      <item> CMAKE_C_COMPILE_FEATURES </item>
-      <item> CMAKE_C_EXTENSIONS </item>
-      <item> CMAKE_C_STANDARD </item>
-      <item> CMAKE_C_STANDARD_REQUIRED </item>
-      <item> CMAKE_DEBUG_POSTFIX </item>
-      <item> CMAKE_DEBUG_TARGET_PROPERTIES </item>
-      <item> CMAKE_DL_LIBS </item>
-      <item> CMAKE_EDIT_COMMAND </item>
-      <item> CMAKE_ERROR_DEPRECATED </item>
-      <item> CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION </item>
-      <item> CMAKE_EXECUTABLE_SUFFIX </item>
-      <item> CMAKE_EXE_LINKER_FLAGS </item>
-      <item> CMAKE_EXPORT_NO_PACKAGE_REGISTRY </item>
-      <item> CMAKE_EXTRA_GENERATOR </item>
-      <item> CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES </item>
-      <item> CMAKE_FIND_LIBRARY_PREFIXES </item>
-      <item> CMAKE_FIND_LIBRARY_SUFFIXES </item>
-      <item> CMAKE_FIND_NO_INSTALL_PREFIX </item>
-      <item> CMAKE_FIND_PACKAGE_NAME </item>
-      <item> CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY </item>
-      <item> CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY </item>
-      <item> CMAKE_FIND_PACKAGE_WARN_NO_MODULE </item>
-      <item> CMAKE_FIND_ROOT_PATH </item>
-      <item> CMAKE_FIND_ROOT_PATH_MODE_INCLUDE </item>
-      <item> CMAKE_FIND_ROOT_PATH_MODE_LIBRARY </item>
-      <item> CMAKE_FIND_ROOT_PATH_MODE_PACKAGE </item>
-      <item> CMAKE_FIND_ROOT_PATH_MODE_PROGRAM </item>
-      <item> CMAKE_FRAMEWORK_PATH </item>
-      <item> CMAKE_Fortran_FORMAT </item>
-      <item> CMAKE_Fortran_MODDIR_DEFAULT </item>
-      <item> CMAKE_Fortran_MODDIR_FLAG </item>
-      <item> CMAKE_Fortran_MODOUT_FLAG </item>
-      <item> CMAKE_Fortran_MODULE_DIRECTORY </item>
-      <item> CMAKE_GENERATOR </item>
-      <item> CMAKE_GENERATOR_PLATFORM </item>
-      <item> CMAKE_GENERATOR_TOOLSET </item>
-      <item> CMAKE_GNUtoMS </item>
-      <item> CMAKE_HOME_DIRECTORY </item>
-      <item> CMAKE_HOST_APPLE </item>
-      <item> CMAKE_HOST_SYSTEM </item>
-      <item> CMAKE_HOST_SYSTEM_NAME </item>
-      <item> CMAKE_HOST_SYSTEM_PROCESSOR </item>
-      <item> CMAKE_HOST_SYSTEM_VERSION </item>
-      <item> CMAKE_HOST_UNIX </item>
-      <item> CMAKE_HOST_WIN32 </item>
-      <item> CMAKE_IGNORE_PATH </item>
-      <item> CMAKE_IMPORT_LIBRARY_PREFIX </item>
-      <item> CMAKE_IMPORT_LIBRARY_SUFFIX </item>
-      <item> CMAKE_INCLUDE_CURRENT_DIR </item>
-      <item> CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE </item>
-      <item> CMAKE_INCLUDE_DIRECTORIES_BEFORE </item>
-      <item> CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE </item>
-      <item> CMAKE_INCLUDE_PATH </item>
-      <item> CMAKE_INSTALL_DEFAULT_COMPONENT_NAME </item>
-      <item> CMAKE_INSTALL_MESSAGE </item>
-      <item> CMAKE_INSTALL_NAME_DIR </item>
-      <item> CMAKE_INSTALL_PREFIX </item>
-      <item> CMAKE_INSTALL_RPATH </item>
-      <item> CMAKE_INSTALL_RPATH_USE_LINK_PATH </item>
-      <item> CMAKE_INTERNAL_PLATFORM_ABI </item>
-      <item> CMAKE_JOB_POOL_COMPILE </item>
-      <item> CMAKE_JOB_POOL_LINK </item>
-      <item> CMAKE_LIBRARY_ARCHITECTURE </item>
-      <item> CMAKE_LIBRARY_ARCHITECTURE_REGEX </item>
-      <item> CMAKE_LIBRARY_OUTPUT_DIRECTORY </item>
-      <item> CMAKE_LIBRARY_PATH </item>
-      <item> CMAKE_LIBRARY_PATH_FLAG </item>
-      <item> CMAKE_LINK_DEF_FILE_FLAG </item>
-      <item> CMAKE_LINK_DEPENDS_NO_SHARED </item>
-      <item> CMAKE_LINK_INTERFACE_LIBRARIES </item>
-      <item> CMAKE_LINK_LIBRARY_FILE_FLAG </item>
-      <item> CMAKE_LINK_LIBRARY_FLAG </item>
-      <item> CMAKE_LINK_LIBRARY_SUFFIX </item>
-      <item> CMAKE_MACOSX_BUNDLE </item>
-      <item> CMAKE_MACOSX_RPATH </item>
-      <item> CMAKE_MAJOR_VERSION </item>
-      <item> CMAKE_MAKE_PROGRAM </item>
-      <item> CMAKE_MATCH_COUNT </item>
-      <item> CMAKE_MFC_FLAG </item>
-      <item> CMAKE_MINIMUM_REQUIRED_VERSION </item>
-      <item> CMAKE_MINOR_VERSION </item>
-      <item> CMAKE_MODULE_LINKER_FLAGS </item>
-      <item> CMAKE_MODULE_PATH </item>
-      <item> CMAKE_NOT_USING_CONFIG_FLAGS </item>
-      <item> CMAKE_NO_BUILTIN_CHRPATH </item>
-      <item> CMAKE_NO_SYSTEM_FROM_IMPORTED </item>
-      <item> CMAKE_OBJECT_PATH_MAX </item>
-      <item> CMAKE_OSX_ARCHITECTURES </item>
-      <item> CMAKE_OSX_DEPLOYMENT_TARGET </item>
-      <item> CMAKE_OSX_SYSROOT </item>
-      <item> CMAKE_PARENT_LIST_FILE </item>
-      <item> CMAKE_PATCH_VERSION </item>
-      <item> CMAKE_PDB_OUTPUT_DIRECTORY </item>
-      <item> CMAKE_POSITION_INDEPENDENT_CODE </item>
-      <item> CMAKE_PREFIX_PATH </item>
-      <item> CMAKE_PROGRAM_PATH </item>
-      <item> CMAKE_PROJECT_NAME </item>
-      <item> CMAKE_RANLIB </item>
-      <item> CMAKE_ROOT </item>
-      <item> CMAKE_RUNTIME_OUTPUT_DIRECTORY </item>
-      <item> CMAKE_SCRIPT_MODE_FILE </item>
-      <item> CMAKE_SHARED_LIBRARY_PREFIX </item>
-      <item> CMAKE_SHARED_LIBRARY_SUFFIX </item>
-      <item> CMAKE_SHARED_LINKER_FLAGS </item>
-      <item> CMAKE_SHARED_MODULE_PREFIX </item>
-      <item> CMAKE_SHARED_MODULE_SUFFIX </item>
-      <item> CMAKE_SIZEOF_VOID_P </item>
-      <item> CMAKE_SKIP_BUILD_RPATH </item>
-      <item> CMAKE_SKIP_INSTALL_ALL_DEPENDENCY </item>
-      <item> CMAKE_SKIP_INSTALL_RPATH </item>
-      <item> CMAKE_SKIP_INSTALL_RULES </item>
-      <item> CMAKE_SKIP_RPATH </item>
-      <item> CMAKE_SOURCE_DIR </item>
-      <item> CMAKE_STAGING_PREFIX </item>
-      <item> CMAKE_STANDARD_LIBRARIES </item>
-      <item> CMAKE_STATIC_LIBRARY_PREFIX </item>
-      <item> CMAKE_STATIC_LIBRARY_SUFFIX </item>
-      <item> CMAKE_STATIC_LINKER_FLAGS </item>
-      <item> CMAKE_SYSROOT </item>
-      <item> CMAKE_SYSTEM </item>
-      <item> CMAKE_SYSTEM_IGNORE_PATH </item>
-      <item> CMAKE_SYSTEM_INCLUDE_PATH </item>
-      <item> CMAKE_SYSTEM_LIBRARY_PATH </item>
-      <item> CMAKE_SYSTEM_NAME </item>
-      <item> CMAKE_SYSTEM_PREFIX_PATH </item>
-      <item> CMAKE_SYSTEM_PROCESSOR </item>
-      <item> CMAKE_SYSTEM_PROGRAM_PATH </item>
-      <item> CMAKE_SYSTEM_VERSION </item>
-      <item> CMAKE_TOOLCHAIN_FILE </item>
-      <item> CMAKE_TRY_COMPILE_CONFIGURATION </item>
-      <item> CMAKE_TWEAK_VERSION </item>
-      <item> CMAKE_USER_MAKE_RULES_OVERRIDE </item>
-      <item> CMAKE_USE_RELATIVE_PATHS </item>
-      <item> CMAKE_VERBOSE_MAKEFILE </item>
-      <item> CMAKE_VERSION </item>
-      <item> CMAKE_VISIBILITY_INLINES_HIDDEN </item>
-      <item> CMAKE_VS_DEVENV_COMMAND </item>
-      <item> CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD </item>
-      <item> CMAKE_VS_INTEL_Fortran_PROJECT_VERSION </item>
-      <item> CMAKE_VS_MSBUILD_COMMAND </item>
-      <item> CMAKE_VS_MSDEV_COMMAND </item>
-      <item> CMAKE_VS_NsightTegra_VERSION </item>
-      <item> CMAKE_VS_PLATFORM_NAME </item>
-      <item> CMAKE_VS_PLATFORM_TOOLSET </item>
-      <item> CMAKE_WARN_DEPRECATED </item>
-      <item> CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION </item>
-      <item> CMAKE_WIN32_EXECUTABLE </item>
-      <item> CMAKE_XCODE_PLATFORM_TOOLSET </item>
-      <item> CPACK_ABSOLUTE_DESTINATION_FILES </item>
-      <item> CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY </item>
-      <item> CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION </item>
-      <item> CPACK_INCLUDE_TOPLEVEL_DIRECTORY </item>
-      <item> CPACK_INSTALL_SCRIPT </item>
-      <item> CPACK_PACKAGING_INSTALL_PREFIX </item>
-      <item> CPACK_SET_DESTDIR </item>
-      <item> CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION </item>
-      <item> CTEST_BINARY_DIRECTORY </item>
-      <item> CTEST_BUILD_COMMAND </item>
-      <item> CTEST_BUILD_NAME </item>
-      <item> CTEST_BZR_COMMAND </item>
-      <item> CTEST_BZR_UPDATE_OPTIONS </item>
-      <item> CTEST_CHECKOUT_COMMAND </item>
-      <item> CTEST_CONFIGURATION_TYPE </item>
-      <item> CTEST_CONFIGURE_COMMAND </item>
-      <item> CTEST_COVERAGE_COMMAND </item>
-      <item> CTEST_COVERAGE_EXTRA_FLAGS </item>
-      <item> CTEST_CURL_OPTIONS </item>
-      <item> CTEST_CVS_CHECKOUT </item>
-      <item> CTEST_CVS_COMMAND </item>
-      <item> CTEST_CVS_UPDATE_OPTIONS </item>
-      <item> CTEST_DROP_LOCATION </item>
-      <item> CTEST_DROP_METHOD </item>
-      <item> CTEST_DROP_SITE </item>
-      <item> CTEST_DROP_SITE_CDASH </item>
-      <item> CTEST_DROP_SITE_PASSWORD </item>
-      <item> CTEST_DROP_SITE_USER </item>
-      <item> CTEST_GIT_COMMAND </item>
-      <item> CTEST_GIT_UPDATE_CUSTOM </item>
-      <item> CTEST_GIT_UPDATE_OPTIONS </item>
-      <item> CTEST_HG_COMMAND </item>
-      <item> CTEST_HG_UPDATE_OPTIONS </item>
-      <item> CTEST_MEMORYCHECK_COMMAND </item>
-      <item> CTEST_MEMORYCHECK_COMMAND_OPTIONS </item>
-      <item> CTEST_MEMORYCHECK_SANITIZER_OPTIONS </item>
-      <item> CTEST_MEMORYCHECK_SUPPRESSIONS_FILE </item>
-      <item> CTEST_MEMORYCHECK_TYPE </item>
-      <item> CTEST_NIGHTLY_START_TIME </item>
-      <item> CTEST_P4_CLIENT </item>
-      <item> CTEST_P4_COMMAND </item>
-      <item> CTEST_P4_OPTIONS </item>
-      <item> CTEST_P4_UPDATE_OPTIONS </item>
-      <item> CTEST_SCP_COMMAND </item>
-      <item> CTEST_SITE </item>
-      <item> CTEST_SOURCE_DIRECTORY </item>
-      <item> CTEST_SVN_COMMAND </item>
-      <item> CTEST_SVN_OPTIONS </item>
-      <item> CTEST_SVN_UPDATE_OPTIONS </item>
-      <item> CTEST_TEST_TIMEOUT </item>
-      <item> CTEST_TRIGGER_SITE </item>
-      <item> CTEST_UPDATE_COMMAND </item>
-      <item> CTEST_UPDATE_OPTIONS </item>
-      <item> CTEST_UPDATE_VERSION_ONLY </item>
-      <item> CTEST_USE_LAUNCHERS </item>
-      <item> CYGWIN </item>
-      <item> ENV </item>
-      <item> EXECUTABLE_OUTPUT_PATH </item>
-      <item> GHS-MULTI </item>
-      <item> LIBRARY_OUTPUT_PATH </item>
-      <item> MINGW </item>
-      <item> MSVC </item>
-      <item> MSVC10 </item>
-      <item> MSVC11 </item>
-      <item> MSVC12 </item>
-      <item> MSVC14 </item>
-      <item> MSVC60 </item>
-      <item> MSVC70 </item>
-      <item> MSVC71 </item>
-      <item> MSVC80 </item>
-      <item> MSVC90 </item>
-      <item> MSVC_IDE </item>
-      <item> MSVC_VERSION </item>
-      <item> PROJECT_BINARY_DIR </item>
-      <item> PROJECT_NAME </item>
-      <item> PROJECT_SOURCE_DIR </item>
-      <item> PROJECT_VERSION </item>
-      <item> PROJECT_VERSION_MAJOR </item>
-      <item> PROJECT_VERSION_MINOR </item>
-      <item> PROJECT_VERSION_PATCH </item>
-      <item> PROJECT_VERSION_TWEAK </item>
-      <item> UNIX </item>
-      <item> WIN32 </item>
-      <item> WINCE </item>
-      <item> WINDOWS_PHONE </item>
-      <item> WINDOWS_STORE </item>
-      <item> XCODE_VERSION </item>
+      <item>APPLE</item>
+      <item>BORLAND</item>
+      <item>BUILD_SHARED_LIBS</item>
+      <item>CMAKE_ABSOLUTE_DESTINATION_FILES</item>
+      <item>CMAKE_ANDROID_API</item>
+      <item>CMAKE_ANDROID_API_MIN</item>
+      <item>CMAKE_ANDROID_GUI</item>
+      <item>CMAKE_APPBUNDLE_PATH</item>
+      <item>CMAKE_AR</item>
+      <item>CMAKE_ARCHIVE_OUTPUT_DIRECTORY</item>
+      <item>CMAKE_ARGC</item>
+      <item>CMAKE_ARGV0</item>
+      <item>CMAKE_AUTOMOC</item>
+      <item>CMAKE_AUTOMOC_MOC_OPTIONS</item>
+      <item>CMAKE_AUTOMOC_RELAXED_MODE</item>
+      <item>CMAKE_AUTORCC</item>
+      <item>CMAKE_AUTORCC_OPTIONS</item>
+      <item>CMAKE_AUTOUIC</item>
+      <item>CMAKE_AUTOUIC_OPTIONS</item>
+      <item>CMAKE_BACKWARDS_COMPATIBILITY</item>
+      <item>CMAKE_BINARY_DIR</item>
+      <item>CMAKE_BUILD_TOOL</item>
+      <item>CMAKE_BUILD_TYPE</item>
+      <item>CMAKE_BUILD_WITH_INSTALL_RPATH</item>
+      <item>CMAKE_CACHEFILE_DIR</item>
+      <item>CMAKE_CACHE_MAJOR_VERSION</item>
+      <item>CMAKE_CACHE_MINOR_VERSION</item>
+      <item>CMAKE_CACHE_PATCH_VERSION</item>
+      <item>CMAKE_CFG_INTDIR</item>
+      <item>CMAKE_CL_64</item>
+      <item>CMAKE_COLOR_MAKEFILE</item>
+      <item>CMAKE_COMMAND</item>
+      <item>CMAKE_COMPILER_2005</item>
+      <item>CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY</item>
+      <item>CMAKE_CONFIGURATION_TYPES</item>
+      <item>CMAKE_CROSSCOMPILING</item>
+      <item>CMAKE_CROSSCOMPILING_EMULATOR</item>
+      <item>CMAKE_CTEST_COMMAND</item>
+      <item>CMAKE_CURRENT_BINARY_DIR</item>
+      <item>CMAKE_CURRENT_LIST_DIR</item>
+      <item>CMAKE_CURRENT_LIST_FILE</item>
+      <item>CMAKE_CURRENT_LIST_LINE</item>
+      <item>CMAKE_CURRENT_SOURCE_DIR</item>
+      <item>CMAKE_CXX_COMPILE_FEATURES</item>
+      <item>CMAKE_CXX_EXTENSIONS</item>
+      <item>CMAKE_CXX_STANDARD</item>
+      <item>CMAKE_CXX_STANDARD_REQUIRED</item>
+      <item>CMAKE_C_COMPILE_FEATURES</item>
+      <item>CMAKE_C_EXTENSIONS</item>
+      <item>CMAKE_C_STANDARD</item>
+      <item>CMAKE_C_STANDARD_REQUIRED</item>
+      <item>CMAKE_DEBUG_POSTFIX</item>
+      <item>CMAKE_DEBUG_TARGET_PROPERTIES</item>
+      <item>CMAKE_DL_LIBS</item>
+      <item>CMAKE_EDIT_COMMAND</item>
+      <item>CMAKE_ERROR_DEPRECATED</item>
+      <item>CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION</item>
+      <item>CMAKE_EXECUTABLE_SUFFIX</item>
+      <item>CMAKE_EXE_LINKER_FLAGS</item>
+      <item>CMAKE_EXPORT_NO_PACKAGE_REGISTRY</item>
+      <item>CMAKE_EXTRA_GENERATOR</item>
+      <item>CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES</item>
+      <item>CMAKE_FIND_LIBRARY_PREFIXES</item>
+      <item>CMAKE_FIND_LIBRARY_SUFFIXES</item>
+      <item>CMAKE_FIND_NO_INSTALL_PREFIX</item>
+      <item>CMAKE_FIND_PACKAGE_NAME</item>
+      <item>CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY</item>
+      <item>CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY</item>
+      <item>CMAKE_FIND_PACKAGE_WARN_NO_MODULE</item>
+      <item>CMAKE_FIND_ROOT_PATH</item>
+      <item>CMAKE_FIND_ROOT_PATH_MODE_INCLUDE</item>
+      <item>CMAKE_FIND_ROOT_PATH_MODE_LIBRARY</item>
+      <item>CMAKE_FIND_ROOT_PATH_MODE_PACKAGE</item>
+      <item>CMAKE_FIND_ROOT_PATH_MODE_PROGRAM</item>
+      <item>CMAKE_FRAMEWORK_PATH</item>
+      <item>CMAKE_Fortran_FORMAT</item>
+      <item>CMAKE_Fortran_MODDIR_DEFAULT</item>
+      <item>CMAKE_Fortran_MODDIR_FLAG</item>
+      <item>CMAKE_Fortran_MODOUT_FLAG</item>
+      <item>CMAKE_Fortran_MODULE_DIRECTORY</item>
+      <item>CMAKE_GENERATOR</item>
+      <item>CMAKE_GENERATOR_PLATFORM</item>
+      <item>CMAKE_GENERATOR_TOOLSET</item>
+      <item>CMAKE_GNUtoMS</item>
+      <item>CMAKE_HOME_DIRECTORY</item>
+      <item>CMAKE_HOST_APPLE</item>
+      <item>CMAKE_HOST_SYSTEM</item>
+      <item>CMAKE_HOST_SYSTEM_NAME</item>
+      <item>CMAKE_HOST_SYSTEM_PROCESSOR</item>
+      <item>CMAKE_HOST_SYSTEM_VERSION</item>
+      <item>CMAKE_HOST_UNIX</item>
+      <item>CMAKE_HOST_WIN32</item>
+      <item>CMAKE_IGNORE_PATH</item>
+      <item>CMAKE_IMPORT_LIBRARY_PREFIX</item>
+      <item>CMAKE_IMPORT_LIBRARY_SUFFIX</item>
+      <item>CMAKE_INCLUDE_CURRENT_DIR</item>
+      <item>CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE</item>
+      <item>CMAKE_INCLUDE_DIRECTORIES_BEFORE</item>
+      <item>CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE</item>
+      <item>CMAKE_INCLUDE_PATH</item>
+      <item>CMAKE_INSTALL_DEFAULT_COMPONENT_NAME</item>
+      <item>CMAKE_INSTALL_MESSAGE</item>
+      <item>CMAKE_INSTALL_NAME_DIR</item>
+      <item>CMAKE_INSTALL_PREFIX</item>
+      <item>CMAKE_INSTALL_RPATH</item>
+      <item>CMAKE_INSTALL_RPATH_USE_LINK_PATH</item>
+      <item>CMAKE_INTERNAL_PLATFORM_ABI</item>
+      <item>CMAKE_JOB_POOL_COMPILE</item>
+      <item>CMAKE_JOB_POOL_LINK</item>
+      <item>CMAKE_LIBRARY_ARCHITECTURE</item>
+      <item>CMAKE_LIBRARY_ARCHITECTURE_REGEX</item>
+      <item>CMAKE_LIBRARY_OUTPUT_DIRECTORY</item>
+      <item>CMAKE_LIBRARY_PATH</item>
+      <item>CMAKE_LIBRARY_PATH_FLAG</item>
+      <item>CMAKE_LINK_DEF_FILE_FLAG</item>
+      <item>CMAKE_LINK_DEPENDS_NO_SHARED</item>
+      <item>CMAKE_LINK_INTERFACE_LIBRARIES</item>
+      <item>CMAKE_LINK_LIBRARY_FILE_FLAG</item>
+      <item>CMAKE_LINK_LIBRARY_FLAG</item>
+      <item>CMAKE_LINK_LIBRARY_SUFFIX</item>
+      <item>CMAKE_MACOSX_BUNDLE</item>
+      <item>CMAKE_MACOSX_RPATH</item>
+      <item>CMAKE_MAJOR_VERSION</item>
+      <item>CMAKE_MAKE_PROGRAM</item>
+      <item>CMAKE_MATCH_COUNT</item>
+      <item>CMAKE_MFC_FLAG</item>
+      <item>CMAKE_MINIMUM_REQUIRED_VERSION</item>
+      <item>CMAKE_MINOR_VERSION</item>
+      <item>CMAKE_MODULE_LINKER_FLAGS</item>
+      <item>CMAKE_MODULE_PATH</item>
+      <item>CMAKE_NOT_USING_CONFIG_FLAGS</item>
+      <item>CMAKE_NO_BUILTIN_CHRPATH</item>
+      <item>CMAKE_NO_SYSTEM_FROM_IMPORTED</item>
+      <item>CMAKE_OBJECT_PATH_MAX</item>
+      <item>CMAKE_OSX_ARCHITECTURES</item>
+      <item>CMAKE_OSX_DEPLOYMENT_TARGET</item>
+      <item>CMAKE_OSX_SYSROOT</item>
+      <item>CMAKE_PARENT_LIST_FILE</item>
+      <item>CMAKE_PATCH_VERSION</item>
+      <item>CMAKE_PDB_OUTPUT_DIRECTORY</item>
+      <item>CMAKE_POSITION_INDEPENDENT_CODE</item>
+      <item>CMAKE_PREFIX_PATH</item>
+      <item>CMAKE_PROGRAM_PATH</item>
+      <item>CMAKE_PROJECT_NAME</item>
+      <item>CMAKE_RANLIB</item>
+      <item>CMAKE_ROOT</item>
+      <item>CMAKE_RUNTIME_OUTPUT_DIRECTORY</item>
+      <item>CMAKE_SCRIPT_MODE_FILE</item>
+      <item>CMAKE_SHARED_LIBRARY_PREFIX</item>
+      <item>CMAKE_SHARED_LIBRARY_SUFFIX</item>
+      <item>CMAKE_SHARED_LINKER_FLAGS</item>
+      <item>CMAKE_SHARED_MODULE_PREFIX</item>
+      <item>CMAKE_SHARED_MODULE_SUFFIX</item>
+      <item>CMAKE_SIZEOF_VOID_P</item>
+      <item>CMAKE_SKIP_BUILD_RPATH</item>
+      <item>CMAKE_SKIP_INSTALL_ALL_DEPENDENCY</item>
+      <item>CMAKE_SKIP_INSTALL_RPATH</item>
+      <item>CMAKE_SKIP_INSTALL_RULES</item>
+      <item>CMAKE_SKIP_RPATH</item>
+      <item>CMAKE_SOURCE_DIR</item>
+      <item>CMAKE_STAGING_PREFIX</item>
+      <item>CMAKE_STANDARD_LIBRARIES</item>
+      <item>CMAKE_STATIC_LIBRARY_PREFIX</item>
+      <item>CMAKE_STATIC_LIBRARY_SUFFIX</item>
+      <item>CMAKE_STATIC_LINKER_FLAGS</item>
+      <item>CMAKE_SYSROOT</item>
+      <item>CMAKE_SYSTEM</item>
+      <item>CMAKE_SYSTEM_IGNORE_PATH</item>
+      <item>CMAKE_SYSTEM_INCLUDE_PATH</item>
+      <item>CMAKE_SYSTEM_LIBRARY_PATH</item>
+      <item>CMAKE_SYSTEM_NAME</item>
+      <item>CMAKE_SYSTEM_PREFIX_PATH</item>
+      <item>CMAKE_SYSTEM_PROCESSOR</item>
+      <item>CMAKE_SYSTEM_PROGRAM_PATH</item>
+      <item>CMAKE_SYSTEM_VERSION</item>
+      <item>CMAKE_TOOLCHAIN_FILE</item>
+      <item>CMAKE_TRY_COMPILE_CONFIGURATION</item>
+      <item>CMAKE_TWEAK_VERSION</item>
+      <item>CMAKE_USER_MAKE_RULES_OVERRIDE</item>
+      <item>CMAKE_USE_RELATIVE_PATHS</item>
+      <item>CMAKE_VERBOSE_MAKEFILE</item>
+      <item>CMAKE_VERSION</item>
+      <item>CMAKE_VISIBILITY_INLINES_HIDDEN</item>
+      <item>CMAKE_VS_DEVENV_COMMAND</item>
+      <item>CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD</item>
+      <item>CMAKE_VS_INTEL_Fortran_PROJECT_VERSION</item>
+      <item>CMAKE_VS_MSBUILD_COMMAND</item>
+      <item>CMAKE_VS_MSDEV_COMMAND</item>
+      <item>CMAKE_VS_NsightTegra_VERSION</item>
+      <item>CMAKE_VS_PLATFORM_NAME</item>
+      <item>CMAKE_VS_PLATFORM_TOOLSET</item>
+      <item>CMAKE_WARN_DEPRECATED</item>
+      <item>CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION</item>
+      <item>CMAKE_WIN32_EXECUTABLE</item>
+      <item>CMAKE_XCODE_PLATFORM_TOOLSET</item>
+      <item>CPACK_ABSOLUTE_DESTINATION_FILES</item>
+      <item>CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY</item>
+      <item>CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION</item>
+      <item>CPACK_INCLUDE_TOPLEVEL_DIRECTORY</item>
+      <item>CPACK_INSTALL_SCRIPT</item>
+      <item>CPACK_PACKAGING_INSTALL_PREFIX</item>
+      <item>CPACK_SET_DESTDIR</item>
+      <item>CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION</item>
+      <item>CTEST_BINARY_DIRECTORY</item>
+      <item>CTEST_BUILD_COMMAND</item>
+      <item>CTEST_BUILD_NAME</item>
+      <item>CTEST_BZR_COMMAND</item>
+      <item>CTEST_BZR_UPDATE_OPTIONS</item>
+      <item>CTEST_CHECKOUT_COMMAND</item>
+      <item>CTEST_CONFIGURATION_TYPE</item>
+      <item>CTEST_CONFIGURE_COMMAND</item>
+      <item>CTEST_COVERAGE_COMMAND</item>
+      <item>CTEST_COVERAGE_EXTRA_FLAGS</item>
+      <item>CTEST_CURL_OPTIONS</item>
+      <item>CTEST_CVS_CHECKOUT</item>
+      <item>CTEST_CVS_COMMAND</item>
+      <item>CTEST_CVS_UPDATE_OPTIONS</item>
+      <item>CTEST_DROP_LOCATION</item>
+      <item>CTEST_DROP_METHOD</item>
+      <item>CTEST_DROP_SITE</item>
+      <item>CTEST_DROP_SITE_CDASH</item>
+      <item>CTEST_DROP_SITE_PASSWORD</item>
+      <item>CTEST_DROP_SITE_USER</item>
+      <item>CTEST_GIT_COMMAND</item>
+      <item>CTEST_GIT_UPDATE_CUSTOM</item>
+      <item>CTEST_GIT_UPDATE_OPTIONS</item>
+      <item>CTEST_HG_COMMAND</item>
+      <item>CTEST_HG_UPDATE_OPTIONS</item>
+      <item>CTEST_MEMORYCHECK_COMMAND</item>
+      <item>CTEST_MEMORYCHECK_COMMAND_OPTIONS</item>
+      <item>CTEST_MEMORYCHECK_SANITIZER_OPTIONS</item>
+      <item>CTEST_MEMORYCHECK_SUPPRESSIONS_FILE</item>
+      <item>CTEST_MEMORYCHECK_TYPE</item>
+      <item>CTEST_NIGHTLY_START_TIME</item>
+      <item>CTEST_P4_CLIENT</item>
+      <item>CTEST_P4_COMMAND</item>
+      <item>CTEST_P4_OPTIONS</item>
+      <item>CTEST_P4_UPDATE_OPTIONS</item>
+      <item>CTEST_SCP_COMMAND</item>
+      <item>CTEST_SITE</item>
+      <item>CTEST_SOURCE_DIRECTORY</item>
+      <item>CTEST_SVN_COMMAND</item>
+      <item>CTEST_SVN_OPTIONS</item>
+      <item>CTEST_SVN_UPDATE_OPTIONS</item>
+      <item>CTEST_TEST_TIMEOUT</item>
+      <item>CTEST_TRIGGER_SITE</item>
+      <item>CTEST_UPDATE_COMMAND</item>
+      <item>CTEST_UPDATE_OPTIONS</item>
+      <item>CTEST_UPDATE_VERSION_ONLY</item>
+      <item>CTEST_USE_LAUNCHERS</item>
+      <item>CYGWIN</item>
+      <item>ENV</item>
+      <item>EXECUTABLE_OUTPUT_PATH</item>
+      <item>GHS-MULTI</item>
+      <item>LIBRARY_OUTPUT_PATH</item>
+      <item>MINGW</item>
+      <item>MSVC</item>
+      <item>MSVC10</item>
+      <item>MSVC11</item>
+      <item>MSVC12</item>
+      <item>MSVC14</item>
+      <item>MSVC60</item>
+      <item>MSVC70</item>
+      <item>MSVC71</item>
+      <item>MSVC80</item>
+      <item>MSVC90</item>
+      <item>MSVC_IDE</item>
+      <item>MSVC_VERSION</item>
+      <item>PROJECT_BINARY_DIR</item>
+      <item>PROJECT_NAME</item>
+      <item>PROJECT_SOURCE_DIR</item>
+      <item>PROJECT_VERSION</item>
+      <item>PROJECT_VERSION_MAJOR</item>
+      <item>PROJECT_VERSION_MINOR</item>
+      <item>PROJECT_VERSION_PATCH</item>
+      <item>PROJECT_VERSION_TWEAK</item>
+      <item>UNIX</item>
+      <item>WIN32</item>
+      <item>WINCE</item>
+      <item>WINDOWS_PHONE</item>
+      <item>WINDOWS_STORE</item>
+      <item>XCODE_VERSION</item>
     </list>
 
     <list name="simple_generator_expr">
-      <item> CONFIGURATION </item>
-      <item> ANGLE-R </item>
-      <item> COMMA </item>
-      <item> SEMICOLON </item>
-      <item> INSTALL_PREFIX </item>
+      <item>CONFIGURATION</item>
+      <item>ANGLE-R</item>
+      <item>COMMA</item>
+      <item>SEMICOLON</item>
+      <item>INSTALL_PREFIX</item>
     </list>
 
     <list name="generator_expr">
       <!-- Logical Expressions -->
-      <item> 0 </item>
-      <item> 1 </item>
-      <item> BOOL </item>
-      <item> AND </item>
-      <item> OR </item>
-      <item> NOT </item>
-      <item> STREQUAL </item>
-      <item> EQUAL </item>
-      <item> CONFIG </item>
-      <item> PLATFORM_ID </item>
-      <item> C_COMPILER_ID </item>
-      <item> CXX_COMPILER_ID </item>
-      <item> VERSION_GREATER </item>
-      <item> VERSION_LESS </item>
-      <item> VERSION_EQUAL </item>
-      <item> C_COMPILER_VERSION </item>
-      <item> CXX_COMPILER_VERSION </item>
-      <item> TARGET_POLICY </item>
-      <item> COMPILER_FEATURES </item>
+      <item>0</item>
+      <item>1</item>
+      <item>BOOL</item>
+      <item>AND</item>
+      <item>OR</item>
+      <item>NOT</item>
+      <item>STREQUAL</item>
+      <item>EQUAL</item>
+      <item>CONFIG</item>
+      <item>PLATFORM_ID</item>
+      <item>C_COMPILER_ID</item>
+      <item>CXX_COMPILER_ID</item>
+      <item>VERSION_GREATER</item>
+      <item>VERSION_LESS</item>
+      <item>VERSION_EQUAL</item>
+      <item>C_COMPILER_VERSION</item>
+      <item>CXX_COMPILER_VERSION</item>
+      <item>TARGET_POLICY</item>
+      <item>COMPILER_FEATURES</item>
       <!-- Informational Expressions -->
-      <item> CONFIGURATION </item>
-      <item> TARGET_FILE </item>
-      <item> TARGET_FILE_NAME </item>
-      <item> TARGET_FILE_DIR </item>
-      <item> TARGET_LINKER_FILE </item>
-      <item> TARGET_LINKER_FILE_NAME </item>
-      <item> TARGET_LINKER_FILE_DIR </item>
-      <item> TARGET_SONAME_FILE </item>
-      <item> TARGET_SONAME_FILE_NAME </item>
-      <item> TARGET_SONAME_FILE_DIR </item>
-      <item> TARGET_PDB_FILE </item>
-      <item> TARGET_PDB_FILE_NAME </item>
-      <item> TARGET_PDB_FILE_DIR </item>
-      <item> TARGET_PROPERTY </item>
-      <item> INSTALL_PREFIX </item>
+      <item>CONFIGURATION</item>
+      <item>TARGET_FILE</item>
+      <item>TARGET_FILE_NAME</item>
+      <item>TARGET_FILE_DIR</item>
+      <item>TARGET_LINKER_FILE</item>
+      <item>TARGET_LINKER_FILE_NAME</item>
+      <item>TARGET_LINKER_FILE_DIR</item>
+      <item>TARGET_SONAME_FILE</item>
+      <item>TARGET_SONAME_FILE_NAME</item>
+      <item>TARGET_SONAME_FILE_DIR</item>
+      <item>TARGET_PDB_FILE</item>
+      <item>TARGET_PDB_FILE_NAME</item>
+      <item>TARGET_PDB_FILE_DIR</item>
+      <item>TARGET_PROPERTY</item>
+      <item>INSTALL_PREFIX</item>
       <!-- Output Expressions -->
-      <item> JOIN </item>
-      <item> ANGLE-R </item>
-      <item> COMMA </item>
-      <item> SEMICOLON </item>
-      <item> TARGET_NAME </item>
-      <item> LINK_ONLY </item>
-      <item> INSTALL_INTERFACE </item>
-      <item> BUILD_INTERFACE </item>
-      <item> LOWER_CASE </item>
-      <item> UPPER_CASE </item>
-      <item> MAKE_C_IDENTIFIER </item>
-      <item> TARGET_OBJECTS </item>
+      <item>JOIN</item>
+      <item>ANGLE-R</item>
+      <item>COMMA</item>
+      <item>SEMICOLON</item>
+      <item>TARGET_NAME</item>
+      <item>LINK_ONLY</item>
+      <item>INSTALL_INTERFACE</item>
+      <item>BUILD_INTERFACE</item>
+      <item>LOWER_CASE</item>
+      <item>UPPER_CASE</item>
+      <item>MAKE_C_IDENTIFIER</item>
+      <item>TARGET_OBJECTS</item>
       <!-- TODO Is this from CMake 2.x? -->
-      <item> TARGET_DIR </item>
+      <item>TARGET_DIR</item>
     </list>
 
     <contexts>
diff --git a/src/share/3rdparty/generic-highlighter/css.xml b/src/share/3rdparty/generic-highlighter/css.xml
index 2215c162a98..aa2fe9264b1 100644
--- a/src/share/3rdparty/generic-highlighter/css.xml
+++ b/src/share/3rdparty/generic-highlighter/css.xml
@@ -34,877 +34,877 @@ Changelog:
     <highlighting>
         <list name="properties">
             <!-- W3C > Work Draft, from https://www.w3.org/Style/CSS/all-properties -->
-            <item> azimuth </item>
-            <item> align-content </item>
-            <item> align-items </item>
-            <item> align-self </item>
-            <item> alignment-baseline </item>
-            <item> all </item>
-            <item> animation-name </item>
-            <item> animation-duration </item>
-            <item> animation-iteration-count </item>
-            <item> animation-direction </item>
-            <item> animation-delay </item>
-            <item> animation-play-state </item>
-            <item> animation-fill-mode </item>
-            <item> animation-timing-function </item>
-            <item> backface-visibility </item>
-            <item> background </item>
-            <item> background-attachment </item>
-            <item> background-blend-mode </item>
-            <item> background-break </item>
-            <item> background-clip </item>
-            <item> background-color </item>
-            <item> background-image </item>
-            <item> background-origin </item>
-            <item> background-position </item>
-            <item> background-repeat </item>
-            <item> background-size </item>
-            <item> baseline-shift </item>
-            <item> bookmark-label </item>
-            <item> bookmark-level </item>
-            <item> bookmark-level </item>
-            <item> border </item>
-            <item> border-bottom </item>
-            <item> border-bottom-color </item>
-            <item> border-bottom-image </item>
-            <item> border-bottom-style </item>
-            <item> border-bottom-width </item>
-            <item> border-bottom-left-image </item>
-            <item> border-bottom-left-radius </item>
-            <item> border-bottom-right-image </item>
-            <item> border-bottom-right-radius </item>
-            <item> border-boundary </item>
-            <item> border-collapse </item>
-            <item> border-color </item>
-            <item> border-corner-image </item>
-            <item> border-image </item>
-            <item> border-image-outset </item>
-            <item> border-image-repeat </item>
-            <item> border-image-slice </item>
-            <item> border-image-source </item>
-            <item> border-image-width </item>
-            <item> border-left </item>
-            <item> border-left-color </item>
-            <item> border-left-image </item>
-            <item> border-left-style </item>
-            <item> border-left-width </item>
-            <item> border-radius </item>
-            <item> border-right </item>
-            <item> border-right-color </item>
-            <item> border-right-image </item>
-            <item> border-right-style </item>
-            <item> border-right-width </item>
-            <item> border-spacing </item>
-            <item> border-style </item>
-            <item> border-top </item>
-            <item> border-top-color </item>
-            <item> border-top-image </item>
-            <item> border-top-style </item>
-            <item> border-top-width </item>
-            <item> border-top-left-image </item>
-            <item> border-top-left-radius </item>
-            <item> border-top-right-image </item>
-            <item> border-top-right-radius </item>
-            <item> border-width </item>
-            <item> bottom </item>
-            <item> box-align </item>
-            <item> box-decoration-break </item>
-            <item> box-direction </item>
-            <item> box-flex </item>
-            <item> box-shadow </item>
-            <item> box-sizing </item>
-            <item> box-snap </item>
-            <item> box-suppress </item>
-            <item> break-after </item>
-            <item> break-before </item>
-            <item> break-inside </item>
-            <item> caret-color </item>
-            <item> caption-side </item>
-            <item> chains </item>
-            <item> clear </item>
-            <item> clip </item>
-            <item> clip-path </item>
-            <item> clip-rule </item>
-            <item> color </item>
-            <item> color-interpolation-filters </item>
-            <item> column-count </item>
-            <item> column-fill </item>
-            <item> column-gap </item>
-            <item> column-rule </item>
-            <item> column-rule-color </item>
-            <item> column-rule-style </item>
-            <item> column-rule-width </item>
-            <item> column-span </item>
-            <item> column-width </item>
-            <item> columns </item>
-            <item> content </item>
-            <item> counter-increment </item>
-            <item> counter-reset </item>
-            <item> counter-set </item>
-            <item> cue </item>
-            <item> cue-after </item>
-            <item> cue-before </item>
-            <item> cursor </item>
-            <item> direction </item>
-            <item> display </item>
-            <item> dominant-baseline </item>
-            <item> elevation </item>
-            <item> empty-cells </item>
-            <item> filter </item>
-            <item> flex </item>
-            <item> flex-basis </item>
-            <item> flex-direction </item>
-            <item> flex-flow </item>
-            <item> flex-grow </item>
-            <item> flex-shrink </item>
-            <item> flex-wrap </item>
-            <item> float </item>
-            <item> flood-color </item>
-            <item> flood-opacity </item>
-            <item> flow </item>
-            <item> flow-from </item>
-            <item> flow-into </item>
-            <item> font </item>
-            <item> font-family </item>
-            <item> font-size </item>
-            <item> font-size-adjust </item>
-            <item> font-stretch </item>
-            <item> font-style </item>
-            <item> font-variant </item>
-            <item> font-weight </item>
-            <item> font-stretch </item>
-            <item> font-feature-settings </item>
-            <item> font-kerning </item>
-            <item> font-language-override </item>
-            <item> font-synthesis </item>
-            <item> font-variant-alternates </item>
-            <item> font-variant-caps </item>
-            <item> font-variant-east-asian </item>
-            <item> font-variant-ligatures </item>
-            <item> font-variant-numeric </item>
-            <item> font-variant-position </item>
-            <item> footnote-display </item>
-            <item> footnote-policy </item>
-            <item> glyph-orientation-vertical </item>
-            <item> grid </item>
-            <item> grid-area </item>
-            <item> grid-auto-columns </item>
-            <item> grid-auto-flow </item>
-            <item> grid-auto-rows </item>
-            <item> grid-column </item>
-            <item> grid-column-end </item>
-            <item> grid-column-gap </item>
-            <item> grid-column-start </item>
-            <item> grid-gap </item>
-            <item> grid-row </item>
-            <item> grid-row-end </item>
-            <item> grid-row-gap </item>
-            <item> grid-row-start </item>
-            <item> grid-template </item>
-            <item> grid-template-areas </item>
-            <item> grid-template-columns </item>
-            <item> grid-template-rows </item>
-            <item> hanging-punctuation </item>
-            <item> height </item>
-            <item> hyphens </item>
-            <item> image-orientation </item>
-            <item> image-rendering </item>
-            <item> image-resolution </item>
-            <item> initial-letter </item>
-            <item> initial-letter-align </item>
-            <item> initial-letter-wrap </item>
-            <item> isolation </item>
-            <item> justify-content </item>
-            <item> justify-items </item>
-            <item> justify-self </item>
-            <item> left </item>
-            <item> letter-spacing </item>
-            <item> lighting-color </item>
-            <item> linear-gradient </item>
-            <item> line-grid </item>
-            <item> line-height </item>
-            <item> line-snap </item>
-            <item> list-style </item>
-            <item> list-style-image </item>
-            <item> list-style-keyword </item>
-            <item> list-style-position </item>
-            <item> list-style-type  </item>
-            <item> margin </item>
-            <item> margin-bottom </item>
-            <item> margin-left </item>
-            <item> margin-right </item>
-            <item> margin-top </item>
-            <item> marker-offset </item>
-            <item> marker-side </item>
-            <item> marquee-direction </item>
-            <item> marquee-loop </item>
-            <item> marquee-speed </item>
-            <item> marquee-style </item>
-            <item> mask </item>
-            <item> mask-border </item>
-            <item> mask-border-mode </item>
-            <item> mask-border-outset </item>
-            <item> mask-border-repeat </item>
-            <item> mask-border-slice </item>
-            <item> mask-border-source </item>
-            <item> mask-border-width </item>
-            <item> mask-clip </item>
-            <item> mask-composite </item>
-            <item> mask-image </item>
-            <item> mask-mode </item>
-            <item> mask-origin </item>
-            <item> mask-position </item>
-            <item> mask-repeat </item>
-            <item> mask-size </item>
-            <item> mask-type </item>
-            <item> max-height </item>
-            <item> max-lines </item>
-            <item> max-width </item>
-            <item> min-height </item>
-            <item> min-width </item>
-            <item> mix-blend-mode </item>
-            <item> nav-down </item>
-            <item> nav-left </item>
-            <item> nav-right </item>
-            <item> nav-up </item>
-            <item> object-fit </item>
-            <item> object-position </item>
-            <item> offset-after </item>
-            <item> offset-before </item>
-            <item> offset-end </item>
-            <item> offset-start </item>
-            <item> opacity </item>
-            <item> order </item>
-            <item> orphans </item>
-            <item> outline </item>
-            <item> outline-color </item>
-            <item> outline-offset </item>
-            <item> outline-style </item>
-            <item> outline-width </item>
-            <item> overflow </item>
-            <item> overflow-style </item>
-            <item> overflow-wrap </item>
-            <item> overflow-x </item>
-            <item> overflow-y </item>
-            <item> padding </item>
-            <item> padding-bottom </item>
-            <item> padding-left </item>
-            <item> padding-right </item>
-            <item> padding-top </item>
-            <item> page </item>
-            <item> page-break-after </item>
-            <item> page-break-before </item>
-            <item> page-break-inside </item>
-            <item> pause </item>
-            <item> pause-after </item>
-            <item> pause-before </item>
-            <item> perspective </item>
-            <item> perspective-origin </item>
-            <item> pitch </item>
-            <item> pitch-range </item>
-            <item> play-during </item>
-            <item> pointer-events </item>
-            <item> polar-anchor </item>
-            <item> polar-angle </item>
-            <item> polar-distance </item>
-            <item> polar-origin </item>
-            <item> position </item>
-            <item> presentation-level </item>
-            <item> quotes </item>
-            <item> resize </item>
-            <item> rest </item>
-            <item> rest-after </item>
-            <item> rest-before </item>
-            <item> richness </item>
-            <item> right </item>
-            <item> rotation </item>
-            <item> rotation-point </item>
-            <item> ruby-align </item>
-            <item> ruby-merge </item>
-            <item> ruby-position </item>
-            <item> running </item>
-            <item> scroll-behavior </item>
-            <item> scroll-snap-align </item>
-            <item> scroll-snap-margin </item>
-            <item> scroll-snap-margin-block </item>
-            <item> scroll-snap-margin-block-end </item>
-            <item> scroll-snap-margin-block-start </item>
-            <item> scroll-snap-margin-bottom </item>
-            <item> scroll-snap-margin-inline </item>
-            <item> scroll-snap-margin-inline-end </item>
-            <item> scroll-snap-margin-inline-start </item>
-            <item> scroll-snap-margin-left </item>
-            <item> scroll-snap-margin-right </item>
-            <item> scroll-snap-margin-top </item>
-            <item> scroll-snap-padding </item>
-            <item> scroll-snap-padding-block </item>
-            <item> scroll-snap-padding-block-end </item>
-            <item> scroll-snap-padding-block-start </item>
-            <item> scroll-snap-padding-bottom </item>
-            <item> scroll-snap-padding-inline </item>
-            <item> scroll-snap-padding-inline-end </item>
-            <item> scroll-snap-padding-inline-start </item>
-            <item> scroll-snap-padding-left </item>
-            <item> scroll-snap-padding-right </item>
-            <item> scroll-snap-padding-top </item>
-            <item> scroll-snap-stop </item>
-            <item> scroll-snap-type </item>
-            <item> shape-image-threshold </item>
-            <item> shape-inside </item>
-            <item> shape-margin </item>
-            <item> shape-outside </item>
-            <item> size </item>
-            <item> speak </item>
-            <item> speak-as </item>
-            <item> speak-header </item>
-            <item> speak-numeral </item>
-            <item> speak-punctuation </item>
-            <item> speech-rate </item>
-            <item> stress </item>
-            <item> string-set </item>
-            <item> tab-size </item>
-            <item> table-layout </item>
-            <item> text-align </item>
-            <item> text-align-last </item>
-            <item> text-combine-upright </item>
-            <item> text-decoration </item>
-            <item> text-decoration-color </item>
-            <item> text-decoration-line </item>
-            <item> text-decoration-skip </item>
-            <item> text-decoration-style </item>
-            <item> text-emphasis </item>
-            <item> text-emphasis-color </item>
-            <item> text-emphasis-position </item>
-            <item> text-emphasis-style </item>
-            <item> text-indent </item>
-            <item> text-justify </item>
-            <item> text-orientation </item>
-            <item> text-overflow </item>
-            <item> text-shadow </item>
-            <item> text-transform </item>
-            <item> text-underline-position </item>
-            <item> text-wrap </item>
-            <item> top </item>
-            <item> transform </item>
-            <item> transform-origin </item>
-            <item> transform-style </item>
-            <item> transition </item>
-            <item> transition-delay </item>
-            <item> transition-property </item>
-            <item> transition-duration </item>
-            <item> transition-timing-function </item>
-            <item> unicode-bidi </item>
-            <item> vertical-align </item>
-            <item> visibility </item>
-            <item> voice-balance </item>
-            <item> voice-duration </item>
-            <item> voice-family </item>
-            <item> voice-pitch </item>
-            <item> voice-range </item>
-            <item> voice-rate </item>
-            <item> voice-stress </item>
-            <item> voice-volume </item>
-            <item> volume </item>
-            <item> white-space </item>
-            <item> widows </item>
-            <item> width </item>
-            <item> will-change </item>
-            <item> word-break </item>
-            <item> word-spacing </item>
-            <item> word-wrap </item>
-            <item> wrap-flow </item>
-            <item> wrap-through </item>
-            <item> writing-mode </item>
-            <item> z-index </item>
+            <item>azimuth</item>
+            <item>align-content</item>
+            <item>align-items</item>
+            <item>align-self</item>
+            <item>alignment-baseline</item>
+            <item>all</item>
+            <item>animation-name</item>
+            <item>animation-duration</item>
+            <item>animation-iteration-count</item>
+            <item>animation-direction</item>
+            <item>animation-delay</item>
+            <item>animation-play-state</item>
+            <item>animation-fill-mode</item>
+            <item>animation-timing-function</item>
+            <item>backface-visibility</item>
+            <item>background</item>
+            <item>background-attachment</item>
+            <item>background-blend-mode</item>
+            <item>background-break</item>
+            <item>background-clip</item>
+            <item>background-color</item>
+            <item>background-image</item>
+            <item>background-origin</item>
+            <item>background-position</item>
+            <item>background-repeat</item>
+            <item>background-size</item>
+            <item>baseline-shift</item>
+            <item>bookmark-label</item>
+            <item>bookmark-level</item>
+            <item>bookmark-level</item>
+            <item>border</item>
+            <item>border-bottom</item>
+            <item>border-bottom-color</item>
+            <item>border-bottom-image</item>
+            <item>border-bottom-style</item>
+            <item>border-bottom-width</item>
+            <item>border-bottom-left-image</item>
+            <item>border-bottom-left-radius</item>
+            <item>border-bottom-right-image</item>
+            <item>border-bottom-right-radius</item>
+            <item>border-boundary</item>
+            <item>border-collapse</item>
+            <item>border-color</item>
+            <item>border-corner-image</item>
+            <item>border-image</item>
+            <item>border-image-outset</item>
+            <item>border-image-repeat</item>
+            <item>border-image-slice</item>
+            <item>border-image-source</item>
+            <item>border-image-width</item>
+            <item>border-left</item>
+            <item>border-left-color</item>
+            <item>border-left-image</item>
+            <item>border-left-style</item>
+            <item>border-left-width</item>
+            <item>border-radius</item>
+            <item>border-right</item>
+            <item>border-right-color</item>
+            <item>border-right-image</item>
+            <item>border-right-style</item>
+            <item>border-right-width</item>
+            <item>border-spacing</item>
+            <item>border-style</item>
+            <item>border-top</item>
+            <item>border-top-color</item>
+            <item>border-top-image</item>
+            <item>border-top-style</item>
+            <item>border-top-width</item>
+            <item>border-top-left-image</item>
+            <item>border-top-left-radius</item>
+            <item>border-top-right-image</item>
+            <item>border-top-right-radius</item>
+            <item>border-width</item>
+            <item>bottom</item>
+            <item>box-align</item>
+            <item>box-decoration-break</item>
+            <item>box-direction</item>
+            <item>box-flex</item>
+            <item>box-shadow</item>
+            <item>box-sizing</item>
+            <item>box-snap</item>
+            <item>box-suppress</item>
+            <item>break-after</item>
+            <item>break-before</item>
+            <item>break-inside</item>
+            <item>caret-color</item>
+            <item>caption-side</item>
+            <item>chains</item>
+            <item>clear</item>
+            <item>clip</item>
+            <item>clip-path</item>
+            <item>clip-rule</item>
+            <item>color</item>
+            <item>color-interpolation-filters</item>
+            <item>column-count</item>
+            <item>column-fill</item>
+            <item>column-gap</item>
+            <item>column-rule</item>
+            <item>column-rule-color</item>
+            <item>column-rule-style</item>
+            <item>column-rule-width</item>
+            <item>column-span</item>
+            <item>column-width</item>
+            <item>columns</item>
+            <item>content</item>
+            <item>counter-increment</item>
+            <item>counter-reset</item>
+            <item>counter-set</item>
+            <item>cue</item>
+            <item>cue-after</item>
+            <item>cue-before</item>
+            <item>cursor</item>
+            <item>direction</item>
+            <item>display</item>
+            <item>dominant-baseline</item>
+            <item>elevation</item>
+            <item>empty-cells</item>
+            <item>filter</item>
+            <item>flex</item>
+            <item>flex-basis</item>
+            <item>flex-direction</item>
+            <item>flex-flow</item>
+            <item>flex-grow</item>
+            <item>flex-shrink</item>
+            <item>flex-wrap</item>
+            <item>float</item>
+            <item>flood-color</item>
+            <item>flood-opacity</item>
+            <item>flow</item>
+            <item>flow-from</item>
+            <item>flow-into</item>
+            <item>font</item>
+            <item>font-family</item>
+            <item>font-size</item>
+            <item>font-size-adjust</item>
+            <item>font-stretch</item>
+            <item>font-style</item>
+            <item>font-variant</item>
+            <item>font-weight</item>
+            <item>font-stretch</item>
+            <item>font-feature-settings</item>
+            <item>font-kerning</item>
+            <item>font-language-override</item>
+            <item>font-synthesis</item>
+            <item>font-variant-alternates</item>
+            <item>font-variant-caps</item>
+            <item>font-variant-east-asian</item>
+            <item>font-variant-ligatures</item>
+            <item>font-variant-numeric</item>
+            <item>font-variant-position</item>
+            <item>footnote-display</item>
+            <item>footnote-policy</item>
+            <item>glyph-orientation-vertical</item>
+            <item>grid</item>
+            <item>grid-area</item>
+            <item>grid-auto-columns</item>
+            <item>grid-auto-flow</item>
+            <item>grid-auto-rows</item>
+            <item>grid-column</item>
+            <item>grid-column-end</item>
+            <item>grid-column-gap</item>
+            <item>grid-column-start</item>
+            <item>grid-gap</item>
+            <item>grid-row</item>
+            <item>grid-row-end</item>
+            <item>grid-row-gap</item>
+            <item>grid-row-start</item>
+            <item>grid-template</item>
+            <item>grid-template-areas</item>
+            <item>grid-template-columns</item>
+            <item>grid-template-rows</item>
+            <item>hanging-punctuation</item>
+            <item>height</item>
+            <item>hyphens</item>
+            <item>image-orientation</item>
+            <item>image-rendering</item>
+            <item>image-resolution</item>
+            <item>initial-letter</item>
+            <item>initial-letter-align</item>
+            <item>initial-letter-wrap</item>
+            <item>isolation</item>
+            <item>justify-content</item>
+            <item>justify-items</item>
+            <item>justify-self</item>
+            <item>left</item>
+            <item>letter-spacing</item>
+            <item>lighting-color</item>
+            <item>linear-gradient</item>
+            <item>line-grid</item>
+            <item>line-height</item>
+            <item>line-snap</item>
+            <item>list-style</item>
+            <item>list-style-image</item>
+            <item>list-style-keyword</item>
+            <item>list-style-position</item>
+            <item>list-style-type</item>
+            <item>margin</item>
+            <item>margin-bottom</item>
+            <item>margin-left</item>
+            <item>margin-right</item>
+            <item>margin-top</item>
+            <item>marker-offset</item>
+            <item>marker-side</item>
+            <item>marquee-direction</item>
+            <item>marquee-loop</item>
+            <item>marquee-speed</item>
+            <item>marquee-style</item>
+            <item>mask</item>
+            <item>mask-border</item>
+            <item>mask-border-mode</item>
+            <item>mask-border-outset</item>
+            <item>mask-border-repeat</item>
+            <item>mask-border-slice</item>
+            <item>mask-border-source</item>
+            <item>mask-border-width</item>
+            <item>mask-clip</item>
+            <item>mask-composite</item>
+            <item>mask-image</item>
+            <item>mask-mode</item>
+            <item>mask-origin</item>
+            <item>mask-position</item>
+            <item>mask-repeat</item>
+            <item>mask-size</item>
+            <item>mask-type</item>
+            <item>max-height</item>
+            <item>max-lines</item>
+            <item>max-width</item>
+            <item>min-height</item>
+            <item>min-width</item>
+            <item>mix-blend-mode</item>
+            <item>nav-down</item>
+            <item>nav-left</item>
+            <item>nav-right</item>
+            <item>nav-up</item>
+            <item>object-fit</item>
+            <item>object-position</item>
+            <item>offset-after</item>
+            <item>offset-before</item>
+            <item>offset-end</item>
+            <item>offset-start</item>
+            <item>opacity</item>
+            <item>order</item>
+            <item>orphans</item>
+            <item>outline</item>
+            <item>outline-color</item>
+            <item>outline-offset</item>
+            <item>outline-style</item>
+            <item>outline-width</item>
+            <item>overflow</item>
+            <item>overflow-style</item>
+            <item>overflow-wrap</item>
+            <item>overflow-x</item>
+            <item>overflow-y</item>
+            <item>padding</item>
+            <item>padding-bottom</item>
+            <item>padding-left</item>
+            <item>padding-right</item>
+            <item>padding-top</item>
+            <item>page</item>
+            <item>page-break-after</item>
+            <item>page-break-before</item>
+            <item>page-break-inside</item>
+            <item>pause</item>
+            <item>pause-after</item>
+            <item>pause-before</item>
+            <item>perspective</item>
+            <item>perspective-origin</item>
+            <item>pitch</item>
+            <item>pitch-range</item>
+            <item>play-during</item>
+            <item>pointer-events</item>
+            <item>polar-anchor</item>
+            <item>polar-angle</item>
+            <item>polar-distance</item>
+            <item>polar-origin</item>
+            <item>position</item>
+            <item>presentation-level</item>
+            <item>quotes</item>
+            <item>resize</item>
+            <item>rest</item>
+            <item>rest-after</item>
+            <item>rest-before</item>
+            <item>richness</item>
+            <item>right</item>
+            <item>rotation</item>
+            <item>rotation-point</item>
+            <item>ruby-align</item>
+            <item>ruby-merge</item>
+            <item>ruby-position</item>
+            <item>running</item>
+            <item>scroll-behavior</item>
+            <item>scroll-snap-align</item>
+            <item>scroll-snap-margin</item>
+            <item>scroll-snap-margin-block</item>
+            <item>scroll-snap-margin-block-end</item>
+            <item>scroll-snap-margin-block-start</item>
+            <item>scroll-snap-margin-bottom</item>
+            <item>scroll-snap-margin-inline</item>
+            <item>scroll-snap-margin-inline-end</item>
+            <item>scroll-snap-margin-inline-start</item>
+            <item>scroll-snap-margin-left</item>
+            <item>scroll-snap-margin-right</item>
+            <item>scroll-snap-margin-top</item>
+            <item>scroll-snap-padding</item>
+            <item>scroll-snap-padding-block</item>
+            <item>scroll-snap-padding-block-end</item>
+            <item>scroll-snap-padding-block-start</item>
+            <item>scroll-snap-padding-bottom</item>
+            <item>scroll-snap-padding-inline</item>
+            <item>scroll-snap-padding-inline-end</item>
+            <item>scroll-snap-padding-inline-start</item>
+            <item>scroll-snap-padding-left</item>
+            <item>scroll-snap-padding-right</item>
+            <item>scroll-snap-padding-top</item>
+            <item>scroll-snap-stop</item>
+            <item>scroll-snap-type</item>
+            <item>shape-image-threshold</item>
+            <item>shape-inside</item>
+            <item>shape-margin</item>
+            <item>shape-outside</item>
+            <item>size</item>
+            <item>speak</item>
+            <item>speak-as</item>
+            <item>speak-header</item>
+            <item>speak-numeral</item>
+            <item>speak-punctuation</item>
+            <item>speech-rate</item>
+            <item>stress</item>
+            <item>string-set</item>
+            <item>tab-size</item>
+            <item>table-layout</item>
+            <item>text-align</item>
+            <item>text-align-last</item>
+            <item>text-combine-upright</item>
+            <item>text-decoration</item>
+            <item>text-decoration-color</item>
+            <item>text-decoration-line</item>
+            <item>text-decoration-skip</item>
+            <item>text-decoration-style</item>
+            <item>text-emphasis</item>
+            <item>text-emphasis-color</item>
+            <item>text-emphasis-position</item>
+            <item>text-emphasis-style</item>
+            <item>text-indent</item>
+            <item>text-justify</item>
+            <item>text-orientation</item>
+            <item>text-overflow</item>
+            <item>text-shadow</item>
+            <item>text-transform</item>
+            <item>text-underline-position</item>
+            <item>text-wrap</item>
+            <item>top</item>
+            <item>transform</item>
+            <item>transform-origin</item>
+            <item>transform-style</item>
+            <item>transition</item>
+            <item>transition-delay</item>
+            <item>transition-property</item>
+            <item>transition-duration</item>
+            <item>transition-timing-function</item>
+            <item>unicode-bidi</item>
+            <item>vertical-align</item>
+            <item>visibility</item>
+            <item>voice-balance</item>
+            <item>voice-duration</item>
+            <item>voice-family</item>
+            <item>voice-pitch</item>
+            <item>voice-range</item>
+            <item>voice-rate</item>
+            <item>voice-stress</item>
+            <item>voice-volume</item>
+            <item>volume</item>
+            <item>white-space</item>
+            <item>widows</item>
+            <item>width</item>
+            <item>will-change</item>
+            <item>word-break</item>
+            <item>word-spacing</item>
+            <item>word-wrap</item>
+            <item>wrap-flow</item>
+            <item>wrap-through</item>
+            <item>writing-mode</item>
+            <item>z-index</item>
 
             <!-- Gecko rendering engine CSS property extensions -->
-            <item> -moz-animation-name </item>
-            <item> -moz-animation-duration </item>
-            <item> -moz-animation-iteration </item>
-            <item> -moz-animation-direction </item>
-            <item> -moz-animation-delay </item>
-            <item> -moz-animation-play-state </item>
-            <item> -moz-animation-fill-mode </item>
-            <item> -moz-background-size </item>
-            <item> -moz-border-image </item>
-            <item> -moz-border-bottom-colors </item>
-            <item> -moz-border-left-colors </item>
-            <item> -moz-border-radius </item>
-            <item> -moz-border-radius-topleft </item>
-            <item> -moz-border-radius-topright </item>
-            <item> -moz-border-radius-bottomleft </item>
-            <item> -moz-border-radius-bottomright </item>
-            <item> -moz-border-right-colors </item>
-            <item> -moz-border-top-colors </item>
-            <item> -moz-box </item>
-            <item> -moz-box-flex </item>
-            <item> -moz-box-shadow </item>
-            <item> -moz-box-sizing </item>
-            <item> -moz-column-count </item>
-            <item> -moz-column-gap </item>
-            <item> -moz-hyphens </item>
-            <item> -moz-linear-gradient </item>
-            <item> -moz-opacity </item>
-            <item> -moz-outline-style </item>
-            <item> -moz-perspective </item>
-            <item> -moz-radial-gradient </item>
-            <item> -moz-resize </item>
-            <item> -moz-transform </item>
-            <item> -moz-transform-origin </item>
-            <item> -moz-transform-style </item>
-            <item> -moz-transition </item>
-            <item> -moz-transition-property </item>
-            <item> -moz-transition-duration </item>
+            <item>-moz-animation-name</item>
+            <item>-moz-animation-duration</item>
+            <item>-moz-animation-iteration</item>
+            <item>-moz-animation-direction</item>
+            <item>-moz-animation-delay</item>
+            <item>-moz-animation-play-state</item>
+            <item>-moz-animation-fill-mode</item>
+            <item>-moz-background-size</item>
+            <item>-moz-border-image</item>
+            <item>-moz-border-bottom-colors</item>
+            <item>-moz-border-left-colors</item>
+            <item>-moz-border-radius</item>
+            <item>-moz-border-radius-topleft</item>
+            <item>-moz-border-radius-topright</item>
+            <item>-moz-border-radius-bottomleft</item>
+            <item>-moz-border-radius-bottomright</item>
+            <item>-moz-border-right-colors</item>
+            <item>-moz-border-top-colors</item>
+            <item>-moz-box</item>
+            <item>-moz-box-flex</item>
+            <item>-moz-box-shadow</item>
+            <item>-moz-box-sizing</item>
+            <item>-moz-column-count</item>
+            <item>-moz-column-gap</item>
+            <item>-moz-hyphens</item>
+            <item>-moz-linear-gradient</item>
+            <item>-moz-opacity</item>
+            <item>-moz-outline-style</item>
+            <item>-moz-perspective</item>
+            <item>-moz-radial-gradient</item>
+            <item>-moz-resize</item>
+            <item>-moz-transform</item>
+            <item>-moz-transform-origin</item>
+            <item>-moz-transform-style</item>
+            <item>-moz-transition</item>
+            <item>-moz-transition-property</item>
+            <item>-moz-transition-duration</item>
 
             <!-- Opera rendering engine CSS property extensions -->
-            <item> -o-background-size </item>
-            <item> -o-linear-gradient </item>
-            <item> -o-text-overflow </item>
-            <item> -o-transition </item>
-            <item> -o-transform-origin </item>
+            <item>-o-background-size</item>
+            <item>-o-linear-gradient</item>
+            <item>-o-text-overflow</item>
+            <item>-o-transition</item>
+            <item>-o-transform-origin</item>
 
             <!-- konq specific -->
-            <item> konq_bgpos_x </item>
-            <item> konq_bgpos_y </item>
-            <item> -khtml-background-size </item>
-            <item> -khtml-border-top-left-radius </item>
-            <item> -khtml-border-top-right-radius </item>
-            <item> -khtml-border-bottom-left-radius </item>
-            <item> -khtml-border-bottom-right-radius </item>
-            <item> -khtml-border-radius </item>
-            <item> -khtml-box-shadow </item>
-            <item> -khtml-opacity </item>
+            <item>konq_bgpos_x</item>
+            <item>konq_bgpos_y</item>
+            <item>-khtml-background-size</item>
+            <item>-khtml-border-top-left-radius</item>
+            <item>-khtml-border-top-right-radius</item>
+            <item>-khtml-border-bottom-left-radius</item>
+            <item>-khtml-border-bottom-right-radius</item>
+            <item>-khtml-border-radius</item>
+            <item>-khtml-box-shadow</item>
+            <item>-khtml-opacity</item>
 
             <!-- Webkit rendering engine CSS property extensions -->
-            <item> -webkit-appearance </item>
-            <item> -webkit-animation-name </item>
-            <item> -webkit-animation-duration </item>
-            <item> -webkit-animation-iteration </item>
-            <item> -webkit-animation-direction </item>
-            <item> -webkit-animation-delay </item>
-            <item> -webkit-animation-play-state </item>
-            <item> -webkit-animation-fill-mode </item>
-            <item> -webkit-background-size </item>
-            <item> -webkit-border-image </item>
-            <item> -webkit-border-bottom-colors </item>
-            <item> -webkit-border-left-colors </item>
-            <item> -webkit-border-radius </item>
-            <item> -webkit-border-right-colors </item>
-            <item> -webkit-border-top-colors </item>
-            <item> -webkit-border-top-left-radius </item>
-            <item> -webkit-border-top-right-radius </item>
-            <item> -webkit-border-bottom-left-radius </item>
-            <item> -webkit-border-bottom-right-radius </item>
-            <item> -webkit-border-radius-bottomleft </item>
-            <item> -webkit-border-radius-bottomright </item>
-            <item> -webkit-box-flex </item>
-            <item> -webkit-box-reflect</item>
-            <item> -webkit-box-shadow </item>
-            <item> -webkit-box-sizing </item>
-            <item> -webkit-column-count </item>
-            <item> -webkit-column-gap </item>
-            <item> -webkit-hyphens </item>
-            <item> -webkit-linear-gradient </item>
-            <item> -webkit-gradient </item>
-            <item> -webkit-perspective </item>
-            <item> -webkit-text-fill-color </item>
-            <item> -webkit-text-stroke-color </item>
-            <item> -webkit-text-stroke-width </item>
-            <item> -webkit-text-size-adjust </item>
-            <item> -webkit-transform </item>
-            <item> -webkit-transform-origin </item>
-            <item> -webkit-transform-style </item>
-            <item> -webkit-transition </item>
-            <item> -webkit-transition-property </item>
-            <item> -webkit-transition-duration </item>
+            <item>-webkit-appearance</item>
+            <item>-webkit-animation-name</item>
+            <item>-webkit-animation-duration</item>
+            <item>-webkit-animation-iteration</item>
+            <item>-webkit-animation-direction</item>
+            <item>-webkit-animation-delay</item>
+            <item>-webkit-animation-play-state</item>
+            <item>-webkit-animation-fill-mode</item>
+            <item>-webkit-background-size</item>
+            <item>-webkit-border-image</item>
+            <item>-webkit-border-bottom-colors</item>
+            <item>-webkit-border-left-colors</item>
+            <item>-webkit-border-radius</item>
+            <item>-webkit-border-right-colors</item>
+            <item>-webkit-border-top-colors</item>
+            <item>-webkit-border-top-left-radius</item>
+            <item>-webkit-border-top-right-radius</item>
+            <item>-webkit-border-bottom-left-radius</item>
+            <item>-webkit-border-bottom-right-radius</item>
+            <item>-webkit-border-radius-bottomleft</item>
+            <item>-webkit-border-radius-bottomright</item>
+            <item>-webkit-box-flex</item>
+            <item>-webkit-box-reflect</item>
+            <item>-webkit-box-shadow</item>
+            <item>-webkit-box-sizing</item>
+            <item>-webkit-column-count</item>
+            <item>-webkit-column-gap</item>
+            <item>-webkit-hyphens</item>
+            <item>-webkit-linear-gradient</item>
+            <item>-webkit-gradient</item>
+            <item>-webkit-perspective</item>
+            <item>-webkit-text-fill-color</item>
+            <item>-webkit-text-stroke-color</item>
+            <item>-webkit-text-stroke-width</item>
+            <item>-webkit-text-size-adjust</item>
+            <item>-webkit-transform</item>
+            <item>-webkit-transform-origin</item>
+            <item>-webkit-transform-style</item>
+            <item>-webkit-transition</item>
+            <item>-webkit-transition-property</item>
+            <item>-webkit-transition-duration</item>
 
             <!-- Trident (a.k.a., MSHTML) CSS property extensions -->
-            <item> zoom </item>
-            <item> -ms-animation-name </item>
-            <item> -ms-animation-duration </item>
-            <item> -ms-animation-iteration </item>
-            <item> -ms-animation-direction </item>
-            <item> -ms-animation-delay </item>
-            <item> -ms-animation-play-state </item>
-            <item> -ms-animation-fill-mode </item>
-            <item> -ms-box-sizing </item>
-            <item> -ms-filter </item>
-            <item> -ms-interpolation-mode </item>
-            <item> -ms-linear-gradient </item>
-            <item> -ms-text-size-adjust </item>
-            <item> -ms-transform </item>
-            <item> -ms-transition </item>
+            <item>zoom</item>
+            <item>-ms-animation-name</item>
+            <item>-ms-animation-duration</item>
+            <item>-ms-animation-iteration</item>
+            <item>-ms-animation-direction</item>
+            <item>-ms-animation-delay</item>
+            <item>-ms-animation-play-state</item>
+            <item>-ms-animation-fill-mode</item>
+            <item>-ms-box-sizing</item>
+            <item>-ms-filter</item>
+            <item>-ms-interpolation-mode</item>
+            <item>-ms-linear-gradient</item>
+            <item>-ms-text-size-adjust</item>
+            <item>-ms-transform</item>
+            <item>-ms-transition</item>
 
             <!-- font properties in @font-face -->
-            <item> font-family </item>
-            <item> font-size </item>
-            <item> font-stretch </item>
-            <item> font-style </item>
-            <item> font-variant </item>
-            <item> font-weight </item>
-            <item> unicode-range </item>
-            <item> units-per-em </item>
-            <item> src </item>
-            <item> panose-1 </item>
-            <item> stemv </item>
-            <item> stemh </item>
-            <item> slope </item>
-            <item> cap-height </item>
-            <item> x-height </item>
-            <item> ascent </item>
-            <item> descent </item>
-            <item> widths </item>
-            <item> bbox </item>
-            <item> definition-src </item>
-            <item> baseline </item>
-            <item> centerline </item>
-            <item> mathline </item>
-            <item> topline </item>
+            <item>font-family</item>
+            <item>font-size</item>
+            <item>font-stretch</item>
+            <item>font-style</item>
+            <item>font-variant</item>
+            <item>font-weight</item>
+            <item>unicode-range</item>
+            <item>units-per-em</item>
+            <item>src</item>
+            <item>panose-1</item>
+            <item>stemv</item>
+            <item>stemh</item>
+            <item>slope</item>
+            <item>cap-height</item>
+            <item>x-height</item>
+            <item>ascent</item>
+            <item>descent</item>
+            <item>widths</item>
+            <item>bbox</item>
+            <item>definition-src</item>
+            <item>baseline</item>
+            <item>centerline</item>
+            <item>mathline</item>
+            <item>topline</item>
         </list>
 
         <list name="values">
-            <item> inherit </item>
-            <item> none </item>
-            <item> hidden </item>
-            <item> dotted </item>
-            <item> dashed </item>
-            <item> solid </item>
-            <item> double </item>
-            <item> groove </item>
-            <item> ridge </item>
-            <item> inset </item>
-            <item> outset </item>
-            <item> xx-small </item>
-            <item> x-small </item>
-            <item> small </item>
-            <item> medium </item>
-            <item> large </item>
-            <item> x-large </item>
-            <item> xx-large </item>
-            <item> smaller </item>
-            <item> larger </item>
-            <item> italic </item>
-            <item> oblique </item>
-            <item> small-caps </item>
-            <item> normal </item>
-            <item> bold </item>
-            <item> bolder </item>
-            <item> lighter </item>
-            <item> light </item>
-            <item> 100 </item>
-            <item> 200 </item>
-            <item> 300 </item>
-            <item> 400 </item>
-            <item> 500 </item>
-            <item> 600 </item>
-            <item> 700 </item>
-            <item> 800 </item>
-            <item> 900 </item>
-            <item> transparent </item>
-            <item> repeat </item>
-            <item> repeat-x </item>
-            <item> repeat-y </item>
-            <item> no-repeat </item>
-            <item> baseline </item>
-            <item> sub </item>
-            <item> super </item>
-            <item> top </item>
-            <item> text-top </item>
-            <item> middle </item>
-            <item> bottom </item>
-            <item> text-bottom </item>
-            <item> left </item>
-            <item> right </item>
-            <item> center </item>
-            <item> justify </item>
-            <item> konq-center </item>
-            <item> disc </item>
-            <item> circle </item>
-            <item> square </item>
-            <item> box </item>
-            <item> decimal </item>
-            <item> decimal-leading-zero </item>
-            <item> lower-roman </item>
-            <item> upper-roman </item>
-            <item> lower-greek </item>
-            <item> lower-alpha </item>
-            <item> lower-latin </item>
-            <item> upper-alpha </item>
-            <item> upper-latin </item>
-            <item> hebrew </item>
-            <item> armenian </item>
-            <item> georgian </item>
-            <item> cjk-ideographic </item>
-            <item> hiragana </item>
-            <item> katakana </item>
-            <item> hiragana-iroha </item>
-            <item> katakana-iroha </item>
-            <item> inline </item>
-            <item> inline-block </item>
-            <item> block </item>
-            <item> list-item </item>
-            <item> run-in </item>
-            <item> compact </item>
-            <item> marker </item>
-            <item> table </item>
-            <item> inline-table </item>
-            <item> table-row-group </item>
-            <item> table-header-group </item>
-            <item> table-footer-group </item>
-            <item> table-row </item>
-            <item> table-column-group </item>
-            <item> table-column </item>
-            <item> table-cell </item>
-            <item> table-caption </item>
-            <item> auto </item>
-            <item> crosshair </item>
-            <item> default </item>
-            <item> pointer </item>
-            <item> move </item>
-            <item> e-resize </item>
-            <item> ne-resize </item>
-            <item> nw-resize </item>
-            <item> n-resize </item>
-            <item> se-resize </item>
-            <item> sw-resize </item>
-            <item> s-resize </item>
-            <item> w-resize </item>
-            <item> text </item>
-            <item> wait </item>
-            <item> help </item>
-            <item> above </item>
-            <item> absolute </item>
-            <item> always </item>
-            <item> avoid </item>
-            <item> below </item>
-            <item> bidi-override </item>
-            <item> blink </item>
-            <item> both </item>
-            <item> capitalize </item>
-            <item> caption </item>
-            <item> clip </item>
-            <item> close-quote </item>
-            <item> collapse </item>
-            <item> condensed </item>
-            <item> crop </item>
-            <item> cross </item>
-            <item> ellipsis </item>
-            <item> ellipsis-word </item>
-            <item> embed </item>
-            <item> expanded </item>
-            <item> extra-condensed </item>
-            <item> extra-expanded </item>
-            <item> fixed </item>
-            <item> hand </item>
-            <item> hide </item>
-            <item> higher </item>
-            <item> icon </item>
-            <item> inside </item>
-            <item> invert </item>
-            <item> landscape </item>
-            <item> level </item>
-            <item> line-through </item>
-            <item> loud </item>
-            <item> lower </item>
-            <item> lowercase </item>
-            <item> ltr </item>
-            <item> menu </item>
-            <item> message-box </item>
-            <item> mix </item>
-            <item> narrower </item>
-            <item> no-close-quote </item>
-            <item> no-open-quote </item>
-            <item> nowrap </item>
-            <item> open-quote </item>
-            <item> outside </item>
-            <item> overline </item>
-            <item> portrait </item>
-            <item> pre </item>
-            <item> pre-line </item>
-            <item> pre-wrap </item>
-            <item> relative </item>
-            <item> rtl </item>
-            <item> scroll </item>
-            <item> semi-condensed </item>
-            <item> semi-expanded </item>
-            <item> separate </item>
-            <item> show </item>
-            <item> small-caption </item>
-            <item> static </item>
-            <item> static-position </item>
-            <item> status-bar </item>
-            <item> thick </item>
-            <item> thin </item>
-            <item> ultra-condensed </item>
-            <item> ultra-expanded </item>
-            <item> underline </item>
-            <item> uppercase </item>
-            <item> visible </item>
-            <item> wider </item>
-            <item> break </item>
-            <item> serif </item>
-            <item> sans-serif </item>
-            <item> cursive </item>
-            <item> fantasy </item>
-            <item> monospace </item>
-            <item> border-box </item>
-            <item> content-box </item>
-            <item> -epub-hyphens </item>
+            <item>inherit</item>
+            <item>none</item>
+            <item>hidden</item>
+            <item>dotted</item>
+            <item>dashed</item>
+            <item>solid</item>
+            <item>double</item>
+            <item>groove</item>
+            <item>ridge</item>
+            <item>inset</item>
+            <item>outset</item>
+            <item>xx-small</item>
+            <item>x-small</item>
+            <item>small</item>
+            <item>medium</item>
+            <item>large</item>
+            <item>x-large</item>
+            <item>xx-large</item>
+            <item>smaller</item>
+            <item>larger</item>
+            <item>italic</item>
+            <item>oblique</item>
+            <item>small-caps</item>
+            <item>normal</item>
+            <item>bold</item>
+            <item>bolder</item>
+            <item>lighter</item>
+            <item>light</item>
+            <item>100</item>
+            <item>200</item>
+            <item>300</item>
+            <item>400</item>
+            <item>500</item>
+            <item>600</item>
+            <item>700</item>
+            <item>800</item>
+            <item>900</item>
+            <item>transparent</item>
+            <item>repeat</item>
+            <item>repeat-x</item>
+            <item>repeat-y</item>
+            <item>no-repeat</item>
+            <item>baseline</item>
+            <item>sub</item>
+            <item>super</item>
+            <item>top</item>
+            <item>text-top</item>
+            <item>middle</item>
+            <item>bottom</item>
+            <item>text-bottom</item>
+            <item>left</item>
+            <item>right</item>
+            <item>center</item>
+            <item>justify</item>
+            <item>konq-center</item>
+            <item>disc</item>
+            <item>circle</item>
+            <item>square</item>
+            <item>box</item>
+            <item>decimal</item>
+            <item>decimal-leading-zero</item>
+            <item>lower-roman</item>
+            <item>upper-roman</item>
+            <item>lower-greek</item>
+            <item>lower-alpha</item>
+            <item>lower-latin</item>
+            <item>upper-alpha</item>
+            <item>upper-latin</item>
+            <item>hebrew</item>
+            <item>armenian</item>
+            <item>georgian</item>
+            <item>cjk-ideographic</item>
+            <item>hiragana</item>
+            <item>katakana</item>
+            <item>hiragana-iroha</item>
+            <item>katakana-iroha</item>
+            <item>inline</item>
+            <item>inline-block</item>
+            <item>block</item>
+            <item>list-item</item>
+            <item>run-in</item>
+            <item>compact</item>
+            <item>marker</item>
+            <item>table</item>
+            <item>inline-table</item>
+            <item>table-row-group</item>
+            <item>table-header-group</item>
+            <item>table-footer-group</item>
+            <item>table-row</item>
+            <item>table-column-group</item>
+            <item>table-column</item>
+            <item>table-cell</item>
+            <item>table-caption</item>
+            <item>auto</item>
+            <item>crosshair</item>
+            <item>default</item>
+            <item>pointer</item>
+            <item>move</item>
+            <item>e-resize</item>
+            <item>ne-resize</item>
+            <item>nw-resize</item>
+            <item>n-resize</item>
+            <item>se-resize</item>
+            <item>sw-resize</item>
+            <item>s-resize</item>
+            <item>w-resize</item>
+            <item>text</item>
+            <item>wait</item>
+            <item>help</item>
+            <item>above</item>
+            <item>absolute</item>
+            <item>always</item>
+            <item>avoid</item>
+            <item>below</item>
+            <item>bidi-override</item>
+            <item>blink</item>
+            <item>both</item>
+            <item>capitalize</item>
+            <item>caption</item>
+            <item>clip</item>
+            <item>close-quote</item>
+            <item>collapse</item>
+            <item>condensed</item>
+            <item>crop</item>
+            <item>cross</item>
+            <item>ellipsis</item>
+            <item>ellipsis-word</item>
+            <item>embed</item>
+            <item>expanded</item>
+            <item>extra-condensed</item>
+            <item>extra-expanded</item>
+            <item>fixed</item>
+            <item>hand</item>
+            <item>hide</item>
+            <item>higher</item>
+            <item>icon</item>
+            <item>inside</item>
+            <item>invert</item>
+            <item>landscape</item>
+            <item>level</item>
+            <item>line-through</item>
+            <item>loud</item>
+            <item>lower</item>
+            <item>lowercase</item>
+            <item>ltr</item>
+            <item>menu</item>
+            <item>message-box</item>
+            <item>mix</item>
+            <item>narrower</item>
+            <item>no-close-quote</item>
+            <item>no-open-quote</item>
+            <item>nowrap</item>
+            <item>open-quote</item>
+            <item>outside</item>
+            <item>overline</item>
+            <item>portrait</item>
+            <item>pre</item>
+            <item>pre-line</item>
+            <item>pre-wrap</item>
+            <item>relative</item>
+            <item>rtl</item>
+            <item>scroll</item>
+            <item>semi-condensed</item>
+            <item>semi-expanded</item>
+            <item>separate</item>
+            <item>show</item>
+            <item>small-caption</item>
+            <item>static</item>
+            <item>static-position</item>
+            <item>status-bar</item>
+            <item>thick</item>
+            <item>thin</item>
+            <item>ultra-condensed</item>
+            <item>ultra-expanded</item>
+            <item>underline</item>
+            <item>uppercase</item>
+            <item>visible</item>
+            <item>wider</item>
+            <item>break</item>
+            <item>serif</item>
+            <item>sans-serif</item>
+            <item>cursive</item>
+            <item>fantasy</item>
+            <item>monospace</item>
+            <item>border-box</item>
+            <item>content-box</item>
+            <item>-epub-hyphens</item>
         </list>
 
         <list name="colors">
-            <item> aqua </item>
-            <item> black </item>
-            <item> blue </item>
-            <item> cyan </item>
-            <item> fuchsia </item>
-            <item> gray </item>
-            <item> green </item>
-            <item> lime </item>
-            <item> maroon </item>
-            <item> navy </item>
-            <item> olive </item>
-            <item> purple </item>
-            <item> red </item>
-            <item> silver </item>
-            <item> teal </item>
-            <item> white </item>
-            <item> yellow </item>
-            <item> ActiveBorder  </item>
-            <item> ActiveCaption  </item>
-            <item> AppWorkspace  </item>
-            <item> Background  </item>
-            <item> ButtonFace  </item>
-            <item> ButtonHighlight  </item>
-            <item> ButtonShadow  </item>
-            <item> ButtonText  </item>
-            <item> CaptionText  </item>
-            <item> GrayText  </item>
-            <item> Highlight  </item>
-            <item> HighlightText  </item>
-            <item> InactiveBorder  </item>
-            <item> InactiveCaption  </item>
-            <item> InactiveCaptionText  </item>
-            <item> InfoBackground  </item>
-            <item> InfoText  </item>
-            <item> Menu  </item>
-            <item> MenuText  </item>
-            <item> Scrollbar  </item>
-            <item> ThreeDDarkShadow  </item>
-            <item> ThreeDFace  </item>
-            <item> ThreeDHighlight  </item>
-            <item> ThreeDLightShadow  </item>
-            <item> ThreeDShadow  </item>
-            <item> Window  </item>
-            <item> WindowFrame  </item>
-            <item> WindowText  </item>
+            <item>aqua</item>
+            <item>black</item>
+            <item>blue</item>
+            <item>cyan</item>
+            <item>fuchsia</item>
+            <item>gray</item>
+            <item>green</item>
+            <item>lime</item>
+            <item>maroon</item>
+            <item>navy</item>
+            <item>olive</item>
+            <item>purple</item>
+            <item>red</item>
+            <item>silver</item>
+            <item>teal</item>
+            <item>white</item>
+            <item>yellow</item>
+            <item>ActiveBorder</item>
+            <item>ActiveCaption</item>
+            <item>AppWorkspace</item>
+            <item>Background</item>
+            <item>ButtonFace</item>
+            <item>ButtonHighlight</item>
+            <item>ButtonShadow</item>
+            <item>ButtonText</item>
+            <item>CaptionText</item>
+            <item>GrayText</item>
+            <item>Highlight</item>
+            <item>HighlightText</item>
+            <item>InactiveBorder</item>
+            <item>InactiveCaption</item>
+            <item>InactiveCaptionText</item>
+            <item>InfoBackground</item>
+            <item>InfoText</item>
+            <item>Menu</item>
+            <item>MenuText</item>
+            <item>Scrollbar</item>
+            <item>ThreeDDarkShadow</item>
+            <item>ThreeDFace</item>
+            <item>ThreeDHighlight</item>
+            <item>ThreeDLightShadow</item>
+            <item>ThreeDShadow</item>
+            <item>Window</item>
+            <item>WindowFrame</item>
+            <item>WindowText</item>
         </list>
 
         <list name="functions">
-            <item> url </item>
-            <item> attr </item>
-            <item> rect </item>
-            <item> rgb </item>
-            <item> rgba </item>
-            <item> hsl </item>
-            <item> hsla </item>
-            <item> counter </item>
-            <item> counters </item>
+            <item>url</item>
+            <item>attr</item>
+            <item>rect</item>
+            <item>rgb</item>
+            <item>rgba</item>
+            <item>hsl</item>
+            <item>hsla</item>
+            <item>counter</item>
+            <item>counters</item>
 
             <!-- in @font-face -->
-            <item> local </item>
-            <item> format </item>
+            <item>local</item>
+            <item>format</item>
 
             <!-- Trident (a.k.a., MSHTML) rendering engine functional notation extensions -->
-            <item> expression </item>
+            <item>expression</item>
 
         </list>
 
         <list name="mediatypes">
-            <item> all </item>
-            <item> aural </item>
-            <item> braille </item>
-            <item> embossed </item>
-            <item> handheld </item>
-            <item> print </item>
-            <item> projection </item>
-            <item> screen </item>
-            <item> speech </item>
-            <item> tty </item>
-            <item> tv </item>
+            <item>all</item>
+            <item>aural</item>
+            <item>braille</item>
+            <item>embossed</item>
+            <item>handheld</item>
+            <item>print</item>
+            <item>projection</item>
+            <item>screen</item>
+            <item>speech</item>
+            <item>tty</item>
+            <item>tv</item>
         </list>
 
         <list name="mediatypes_op">
-            <item> not </item>
-            <item> only </item>
+            <item>not</item>
+            <item>only</item>
         </list>
 
         <list name="media_features">
-            <item> width </item>
-            <item> min-width </item>
-            <item> max-width</item>
-            <item> height </item>
-            <item> min-height </item>
-            <item> max-height </item>
-            <item> device-width </item>
-            <item> min-device-width </item>
-            <item> max-device-width </item>
-            <item> device-height </item>
-            <item> min-device-height </item>
-            <item> max-device-height </item>
-            <item> orientation </item>
-            <item> aspect-ratio </item>
-            <item> min-aspect-ratio </item>
-            <item> max-aspect-ratio </item>
-            <item> device-aspect-ratio </item>
-            <item> min-device-aspect-ratio </item>
-            <item> max-device-aspect-ratio </item>
-            <item> color </item>
-            <item> min-color </item>
-            <item> max-color </item>
-            <item> color-index </item>
-            <item> min-color-index </item>
-            <item> max-color-index </item>
-            <item> monochrome </item>
-            <item> min-monochrome </item>
-            <item> max-monochrome </item>
-            <item> resolution </item>
-            <item> min-resolution </item>
-            <item> max-resolution </item>
-            <item> scan </item>
-            <item> grid </item>
+            <item>width</item>
+            <item>min-width</item>
+            <item>max-width</item>
+            <item>height</item>
+            <item>min-height</item>
+            <item>max-height</item>
+            <item>device-width</item>
+            <item>min-device-width</item>
+            <item>max-device-width</item>
+            <item>device-height</item>
+            <item>min-device-height</item>
+            <item>max-device-height</item>
+            <item>orientation</item>
+            <item>aspect-ratio</item>
+            <item>min-aspect-ratio</item>
+            <item>max-aspect-ratio</item>
+            <item>device-aspect-ratio</item>
+            <item>min-device-aspect-ratio</item>
+            <item>max-device-aspect-ratio</item>
+            <item>color</item>
+            <item>min-color</item>
+            <item>max-color</item>
+            <item>color-index</item>
+            <item>min-color-index</item>
+            <item>max-color-index</item>
+            <item>monochrome</item>
+            <item>min-monochrome</item>
+            <item>max-monochrome</item>
+            <item>resolution</item>
+            <item>min-resolution</item>
+            <item>max-resolution</item>
+            <item>scan</item>
+            <item>grid</item>
         </list>
 
         <list name="pseudoclasses">
-            <item> hover </item>
-            <item> link </item>
-            <item> visited </item>
-            <item> active </item>
-            <item> focus </item>
-            <item> first-child </item>
-            <item> last-child </item>
-            <item> only-child </item>
-            <item> first-of-type </item>
-            <item> last-of-type </item>
-            <item> only-of-type </item>
-            <item> first-letter </item>
-            <item> first-line </item>
-            <item> before </item>
-            <item> after </item>
-            <item> selection </item>
-            <item> root </item>
-            <item> empty </item>
-            <item> target </item>
-            <item> enabled </item>
-            <item> disabled </item>
-            <item> checked </item>
-            <item> indeterminate </item>
-            <item> nth-child </item>
-            <item> nth-last-child </item>
-            <item> nth-of-type </item>
-            <item> nth-last-of-type </item>
-            <item> not </item>
+            <item>hover</item>
+            <item>link</item>
+            <item>visited</item>
+            <item>active</item>
+            <item>focus</item>
+            <item>first-child</item>
+            <item>last-child</item>
+            <item>only-child</item>
+            <item>first-of-type</item>
+            <item>last-of-type</item>
+            <item>only-of-type</item>
+            <item>first-letter</item>
+            <item>first-line</item>
+            <item>before</item>
+            <item>after</item>
+            <item>selection</item>
+            <item>root</item>
+            <item>empty</item>
+            <item>target</item>
+            <item>enabled</item>
+            <item>disabled</item>
+            <item>checked</item>
+            <item>indeterminate</item>
+            <item>nth-child</item>
+            <item>nth-last-child</item>
+            <item>nth-of-type</item>
+            <item>nth-last-of-type</item>
+            <item>not</item>
         </list>
 
         <contexts>
diff --git a/src/share/3rdparty/generic-highlighter/doxygen.xml b/src/share/3rdparty/generic-highlighter/doxygen.xml
index bac715d95df..a1bbe70cff7 100644
--- a/src/share/3rdparty/generic-highlighter/doxygen.xml
+++ b/src/share/3rdparty/generic-highlighter/doxygen.xml
@@ -3,39 +3,14 @@
 [
     <!ENTITY wordsep "([][,?;()]|\.$|\.?\s)">     <!-- things that end a TagWord -->
 ]>
-<!--
-  This file is part of KDE's kate project.
-
-  Copyright 2004 Dominik Haumann (dhdev@gmx.de)
-  Copyright 2007 Matthew Woehlke (mw_triad@users.sourceforge.net)
-  Copyright 2009-2013 Alex Turbov (I.zaufi@gmail.com)
-
- **********************************************************************
- * This library is free software; you can redistribute it and/or      *
- * modify it under the terms of the GNU Lesser General Public         *
- * License as published by the Free Software Foundation; either       *
- * version 2 of the License, or (at your option) any later version.   *
- *                                                                    *
- * This library is distributed in the hope that it will be useful,    *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of     *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  *
- * Lesser General Public License for more details.                    *
- *                                                                    *
- * You should have received a copy of the GNU Lesser General Public   *
- * License along with this library; if not, write to the              *
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,   *
- * Boston, MA  02110-1301, USA.                                       *
- **********************************************************************
- -->
-
 <language name="Doxygen"
-          version="3"
+          version="4"
           kateversion="5.0"
           section="Markup"
           extensions="*.dox;*.doxygen"
           mimetype="text/x-doxygen"
-          author="Dominik Haumann (dhdev@gmx.de)"
-          license="LGPLv2+"
+          author="Dominik Haumann (dhaumann@kde.org)"
+          license="MIT"
           priority="9">
   <highlighting>
     <!-- NOTE: all tags may begin with a \ or @ char
@@ -44,201 +19,201 @@
          do not present in keywords due separate handle rules...
     -->
     <list name="TagOnly">
-      <item> \arg </item>              <item> @arg </item>
-      <item> \author </item>           <item> @author </item>
-      <item> \authors </item>          <item> @authors </item>
-      <item> \brief </item>            <item> @brief </item>
-      <item> \callgraph </item>        <item> @callgraph </item>
-      <item> \callergraph </item>      <item> @callergraph </item>
-      <item> \date </item>             <item> @date </item>
-      <item> \deprecated </item>       <item> @deprecated </item>
-      <item> \details </item>          <item> @details </item>
-      <item> \docbookonly </item>      <item> @docbookonly </item>
-      <item> \else </item>             <item> @else </item>
-      <item> \endcond </item>          <item> @endcond </item>
-      <item> \enddocbookonly </item>   <item> @enddocbookonly </item>
-      <item> \endhtmlonly </item>      <item> @endhtmlonly </item>
-      <item> \endif </item>            <item> @endif </item>
-      <item> \endinternal </item>      <item> @endinternal </item>
-      <item> \endlatexonly </item>     <item> @endlatexonly </item>
-      <item> \endlink </item>          <item> @endlink </item>
-      <item> \endmanonly </item>       <item> @endmanonly </item>
-      <item> \endparblock </item>      <item> @endparblock </item>
-      <item> \endrtfonly </item>       <item> @endrtfonly </item>
-      <item> \endsecreflist </item>    <item> @endsecreflist </item>
-      <item> \endxmlonly </item>       <item> @endxmlonly </item>
-      <item> \f[ </item>               <item> @f[ </item>
-      <item> \f] </item>               <item> @f] </item>
-      <item> \f$ </item>               <item> @f$ </item>
+      <item>\arg</item>              <item>@arg</item>
+      <item>\author</item>           <item>@author</item>
+      <item>\authors</item>          <item>@authors</item>
+      <item>\brief</item>            <item>@brief</item>
+      <item>\callgraph</item>        <item>@callgraph</item>
+      <item>\callergraph</item>      <item>@callergraph</item>
+      <item>\date</item>             <item>@date</item>
+      <item>\deprecated</item>       <item>@deprecated</item>
+      <item>\details</item>          <item>@details</item>
+      <item>\docbookonly</item>      <item>@docbookonly</item>
+      <item>\else</item>             <item>@else</item>
+      <item>\endcond</item>          <item>@endcond</item>
+      <item>\enddocbookonly</item>   <item>@enddocbookonly</item>
+      <item>\endhtmlonly</item>      <item>@endhtmlonly</item>
+      <item>\endif</item>            <item>@endif</item>
+      <item>\endinternal</item>      <item>@endinternal</item>
+      <item>\endlatexonly</item>     <item>@endlatexonly</item>
+      <item>\endlink</item>          <item>@endlink</item>
+      <item>\endmanonly</item>       <item>@endmanonly</item>
+      <item>\endparblock</item>      <item>@endparblock</item>
+      <item>\endrtfonly</item>       <item>@endrtfonly</item>
+      <item>\endsecreflist</item>    <item>@endsecreflist</item>
+      <item>\endxmlonly</item>       <item>@endxmlonly</item>
+      <item>\f[</item>               <item>@f[</item>
+      <item>\f]</item>               <item>@f]</item>
+      <item>\f$</item>               <item>@f$</item>
       <!-- TODO Add @f{environment}{ and @f} -->
-      <item> \hideinitializer </item>  <item> @hideinitializer </item>
-      <item> \htmlonly </item>         <item> @htmlonly </item>
+      <item>\hideinitializer</item>  <item>@hideinitializer</item>
+      <item>\htmlonly</item>         <item>@htmlonly</item>
       <!-- TODO @internal is a candidate to be handled separately, cuz may introduce folding region -->
-      <item> \internal </item>         <item> @internal </item>
-      <item> \invariant </item>        <item> @invariant </item>
-      <item> \latexonly </item>        <item> @latexonly </item>
-      <item> \li </item>               <item> @li </item>
-      <item> \manonly </item>          <item> @manonly </item>
-      <item> \n </item>                <item> @n </item>
-      <item> \nosubgrouping </item>    <item> @nosubgrouping </item>
-      <item> \only </item>             <item> @only </item>
-      <item> \parblock </item>         <item> @parblock </item>
-      <item> \post </item>             <item> @post </item>
-      <item> \pre </item>              <item> @pre </item>
-      <item> \private </item>          <item> @pivate </item>
-      <item> \privatesection </item>   <item> @pivatesection </item>
-      <item> \protected </item>        <item> @protected </item>
-      <item> \protectedsection </item> <item> @protectedsection </item>
-      <item> \public </item>           <item> @public </item>
-      <item> \publicsection </item>    <item> @publicsection </item>
-      <item> \pure </item>             <item> @pure </item>
-      <item> \remark </item>           <item> @remark </item>
-      <item> \remarks </item>          <item> @remarks </item>
-      <item> \return </item>           <item> @return </item>
-      <item> \returns </item>          <item> @returns </item>
-      <item> \result </item>           <item> @result </item>
-      <item> \rtfonly </item>          <item> @rtfonly </item>
-      <item> \sa </item>               <item> @sa </item>
-      <item> \secreflist </item>       <item> @secreflist </item>
-      <item> \see </item>              <item> @see </item>
-      <item> \short </item>            <item> @short </item>
-      <item> \showinitializer </item>  <item> @showinitializer </item>
-      <item> \since </item>            <item> @since </item>
-      <item> \static </item>           <item> @static </item>
-      <item> \tableofcontents </item>  <item> @tableofcontents </item>
-      <item> \test </item>             <item> @test </item>
-      <item> \version </item>          <item> @version </item>
-      <item> \xmlonly </item>          <item> @xmlonly </item>
+      <item>\internal</item>         <item>@internal</item>
+      <item>\invariant</item>        <item>@invariant</item>
+      <item>\latexonly</item>        <item>@latexonly</item>
+      <item>\li</item>               <item>@li</item>
+      <item>\manonly</item>          <item>@manonly</item>
+      <item>\n</item>                <item>@n</item>
+      <item>\nosubgrouping</item>    <item>@nosubgrouping</item>
+      <item>\only</item>             <item>@only</item>
+      <item>\parblock</item>         <item>@parblock</item>
+      <item>\post</item>             <item>@post</item>
+      <item>\pre</item>              <item>@pre</item>
+      <item>\private</item>          <item>@pivate</item>
+      <item>\privatesection</item>   <item>@pivatesection</item>
+      <item>\protected</item>        <item>@protected</item>
+      <item>\protectedsection</item> <item>@protectedsection</item>
+      <item>\public</item>           <item>@public</item>
+      <item>\publicsection</item>    <item>@publicsection</item>
+      <item>\pure</item>             <item>@pure</item>
+      <item>\remark</item>           <item>@remark</item>
+      <item>\remarks</item>          <item>@remarks</item>
+      <item>\return</item>           <item>@return</item>
+      <item>\returns</item>          <item>@returns</item>
+      <item>\result</item>           <item>@result</item>
+      <item>\rtfonly</item>          <item>@rtfonly</item>
+      <item>\sa</item>               <item>@sa</item>
+      <item>\secreflist</item>       <item>@secreflist</item>
+      <item>\see</item>              <item>@see</item>
+      <item>\short</item>            <item>@short</item>
+      <item>\showinitializer</item>  <item>@showinitializer</item>
+      <item>\since</item>            <item>@since</item>
+      <item>\static</item>           <item>@static</item>
+      <item>\tableofcontents</item>  <item>@tableofcontents</item>
+      <item>\test</item>             <item>@test</item>
+      <item>\version</item>          <item>@version</item>
+      <item>\xmlonly</item>          <item>@xmlonly</item>
       <!-- TODO Introduce separate context for @~ ? -->
-      <item> \# </item>                <item> @# </item>
-      <item> \$ </item>                <item> @$ </item>
-      <item> \% </item>                <item> @% </item>
-      <item> \&amp; </item>            <item> @&amp; </item>
-      <item> \&gt; </item>             <item> @&gt; </item>
-      <item> \&lt; </item>             <item> @&lt; </item>
-      <item> \&quot; </item>           <item> @&quot; </item>
-      <item> \:: </item>               <item> @:: </item>
-      <item> \@ </item>                <item> @@ </item>
-      <item> \\ </item>                <item> @\ </item>
-      <item> \~ </item>                <item> @~ </item>
-      <item> \. </item>                <item> @. </item>
-      <item> \-- </item>               <item> @-- </item>
-      <item> \--- </item>              <item> @--- </item>
+      <item>\#</item>                <item>@#</item>
+      <item>\$</item>                <item>@$</item>
+      <item>\%</item>                <item>@%</item>
+      <item>\&amp;</item>            <item>@&amp;</item>
+      <item>\&gt;</item>             <item>@&gt;</item>
+      <item>\&lt;</item>             <item>@&lt;</item>
+      <item>\&quot;</item>           <item>@&quot;</item>
+      <item>\::</item>               <item>@::</item>
+      <item>\@</item>                <item>@@</item>
+      <item>\\</item>                <item>@\</item>
+      <item>\~</item>                <item>@~</item>
+      <item>\.</item>                <item>@.</item>
+      <item>\--</item>               <item>@--</item>
+      <item>\---</item>              <item>@---</item>
     </list>
 
     <list name="TagWord">
-      <item> \a </item>                <item> @a </item>
-      <item> \anchor </item>           <item> @anchor </item>
-      <item> \b </item>                <item> @b </item>
-      <item> \c </item>                <item> @c </item>
-      <item> \cite </item>             <item> @cite </item>
-      <item> \cond </item>             <item> @cond </item>
-      <item> \copybrief </item>        <item> @copybrief </item>
-      <item> \copydetails </item>      <item> @copydetails </item>
-      <item> \copydoc </item>          <item> @copydoc </item>
-      <item> \def </item>              <item> @def </item>
-      <item> \dir </item>              <item> @dir </item>
-      <item> \dontinclude </item>      <item> @dontinclude </item>
-      <item> \e </item>                <item> @e </item>
-      <item> \elseif </item>           <item> @elseif </item>
-      <item> \em </item>               <item> @em </item>
-      <item> \enum </item>             <item> @enum </item>
-      <item> \example </item>          <item> @example </item>
-      <item> \exception </item>        <item> @exception </item>
-      <item> \exceptions </item>       <item> @exceptions </item>
-      <item> \extends </item>          <item> @extends </item>
-      <item> \file </item>             <item> @file </item>
-      <item> \htmlinclude </item>      <item> @htmlinclude </item>
-      <item> \idlexcept </item>        <item> @idlexcept </item>
-      <item> \if </item>               <item> @if </item>
-      <item> \ifnot </item>            <item> @ifnot </item>
-      <item> \implements </item>       <item> @implements </item>
-      <item> \include </item>          <item> @include </item>
-      <item> \includelineno </item>    <item> @includelineno </item>
-      <item> \latexinclude </item>     <item> @latexinclude </item>
-      <item> \link </item>             <item> @link </item>
-      <item> \memberof </item>         <item> @memberof </item>
-      <item> \namespace </item>        <item> @namespace </item>
-      <item> \p </item>                <item> @p </item>
-      <item> \package </item>          <item> @package </item>
-      <item> \property </item>         <item> @property </item>
-      <item> \relatedalso </item>      <item> @relatedalso </item>
-      <item> \relatesalso </item>      <item> @relatesalso </item>
-      <item> \related </item>          <item> @related </item>
-      <item> \relates </item>          <item> @relates </item>
-      <item> \retval </item>           <item> @retval </item>
-      <item> \throw </item>            <item> @throw </item>
-      <item> \throws </item>           <item> @throws </item>
-      <item> \verbinclude </item>      <item> @verbinclude </item>
-      <item> \version </item>          <item> @version </item>
+      <item>\a</item>                <item>@a</item>
+      <item>\anchor</item>           <item>@anchor</item>
+      <item>\b</item>                <item>@b</item>
+      <item>\c</item>                <item>@c</item>
+      <item>\cite</item>             <item>@cite</item>
+      <item>\cond</item>             <item>@cond</item>
+      <item>\copybrief</item>        <item>@copybrief</item>
+      <item>\copydetails</item>      <item>@copydetails</item>
+      <item>\copydoc</item>          <item>@copydoc</item>
+      <item>\def</item>              <item>@def</item>
+      <item>\dir</item>              <item>@dir</item>
+      <item>\dontinclude</item>      <item>@dontinclude</item>
+      <item>\e</item>                <item>@e</item>
+      <item>\elseif</item>           <item>@elseif</item>
+      <item>\em</item>               <item>@em</item>
+      <item>\enum</item>             <item>@enum</item>
+      <item>\example</item>          <item>@example</item>
+      <item>\exception</item>        <item>@exception</item>
+      <item>\exceptions</item>       <item>@exceptions</item>
+      <item>\extends</item>          <item>@extends</item>
+      <item>\file</item>             <item>@file</item>
+      <item>\htmlinclude</item>      <item>@htmlinclude</item>
+      <item>\idlexcept</item>        <item>@idlexcept</item>
+      <item>\if</item>               <item>@if</item>
+      <item>\ifnot</item>            <item>@ifnot</item>
+      <item>\implements</item>       <item>@implements</item>
+      <item>\include</item>          <item>@include</item>
+      <item>\includelineno</item>    <item>@includelineno</item>
+      <item>\latexinclude</item>     <item>@latexinclude</item>
+      <item>\link</item>             <item>@link</item>
+      <item>\memberof</item>         <item>@memberof</item>
+      <item>\namespace</item>        <item>@namespace</item>
+      <item>\p</item>                <item>@p</item>
+      <item>\package</item>          <item>@package</item>
+      <item>\property</item>         <item>@property</item>
+      <item>\relatedalso</item>      <item>@relatedalso</item>
+      <item>\relatesalso</item>      <item>@relatesalso</item>
+      <item>\related</item>          <item>@related</item>
+      <item>\relates</item>          <item>@relates</item>
+      <item>\retval</item>           <item>@retval</item>
+      <item>\throw</item>            <item>@throw</item>
+      <item>\throws</item>           <item>@throws</item>
+      <item>\verbinclude</item>      <item>@verbinclude</item>
+      <item>\version</item>          <item>@version</item>
       <!-- TODO Introduce separate context for @xrefitem? -->
-      <item> \xrefitem </item>         <item> @xrefitem </item>
+      <item>\xrefitem</item>         <item>@xrefitem</item>
     </list>
     <list name="TagParam">
-      <item> \param </item>            <item> @param </item>
+      <item>\param</item>            <item>@param</item>
       <!-- TODO @tparam has no optional direction actually! -->
-      <item> \tparam </item>           <item> @tparam </item>
+      <item>\tparam</item>           <item>@tparam</item>
     </list>
     <!-- TODO Better (separate?) highlighting for @image required -->
     <list name="TagWordWord">
-      <item> \image </item>            <item> @image </item>
+      <item>\image</item>            <item>@image</item>
     </list>
       <!-- TODO @union, @struct, @protocol, @interface, @class, @category
            actually takes 3 params, 1 mandatory and 2 optional
         -->
       <!-- TODO @headerfile actually takes 2 params, where last one is optional -->
     <list name="TagWordString">
-      <item> \addtogroup </item>       <item> @addtogroup </item>
-      <item> \category </item>         <item> @category </item>
-      <item> \class </item>            <item> @class </item>
-      <item> \diafile </item>          <item> @diafile </item>
-      <item> \dotfile </item>          <item> @dotfile </item>
-      <item> \defgroup </item>         <item> @defgroup </item>
-      <item> \interface </item>        <item> @interface </item>
-      <item> \headerfile </item>       <item> @headerfile </item>
-      <item> \mscfile </item>          <item> @mscfile </item>
-      <item> \page </item>             <item> @page </item>
-      <item> \paragraph </item>        <item> @paragraph </item>
-      <item> \protocol </item>         <item> @prtocol </item>
-      <item> \ref </item>              <item> @ref </item>
-      <item> \section </item>          <item> @section </item>
-      <item> \snippet </item>          <item> @snippet </item>
-      <item> \struct </item>           <item> @struct </item>
-      <item> \subpage </item>          <item> @subpage </item>
-      <item> \subsection </item>       <item> @subsection </item>
-      <item> \subsubsection </item>    <item> @subsubsection </item>
-      <item> \union </item>            <item> @union </item>
-      <item> \weakgroup </item>        <item> @weakgroup </item>
+      <item>\addtogroup</item>       <item>@addtogroup</item>
+      <item>\category</item>         <item>@category</item>
+      <item>\class</item>            <item>@class</item>
+      <item>\diafile</item>          <item>@diafile</item>
+      <item>\dotfile</item>          <item>@dotfile</item>
+      <item>\defgroup</item>         <item>@defgroup</item>
+      <item>\interface</item>        <item>@interface</item>
+      <item>\headerfile</item>       <item>@headerfile</item>
+      <item>\mscfile</item>          <item>@mscfile</item>
+      <item>\page</item>             <item>@page</item>
+      <item>\paragraph</item>        <item>@paragraph</item>
+      <item>\protocol</item>         <item>@prtocol</item>
+      <item>\ref</item>              <item>@ref</item>
+      <item>\section</item>          <item>@section</item>
+      <item>\snippet</item>          <item>@snippet</item>
+      <item>\struct</item>           <item>@struct</item>
+      <item>\subpage</item>          <item>@subpage</item>
+      <item>\subsection</item>       <item>@subsection</item>
+      <item>\subsubsection</item>    <item>@subsubsection</item>
+      <item>\union</item>            <item>@union</item>
+      <item>\weakgroup</item>        <item>@weakgroup</item>
     </list>
     <list name="TagString">
-      <item> \addindex </item>         <item> @addindex </item>
-      <item> \copyright </item>        <item> @copyright </item>
-      <item> \fn </item>               <item> @fn </item>
-      <item> \ingroup </item>          <item> @ingroup </item>
-      <item> \line </item>             <item> @line </item>
-      <item> \mainpage </item>         <item> @mainpage </item>
-      <item> \name </item>             <item> @name </item>
-      <item> \overload </item>         <item> @overload </item>
-      <item> \par </item>              <item> @par </item>
-      <item> \skip </item>             <item> @skip </item>
-      <item> \skipline </item>         <item> @skipline </item>
-      <item> \typedef </item>          <item> @typedef </item>
-      <item> \until </item>            <item> @until </item>
-      <item> \var </item>              <item> @var </item>
-      <item> \vhdlflow </item>         <item> @vhdlflow </item>
+      <item>\addindex</item>         <item>@addindex</item>
+      <item>\copyright</item>        <item>@copyright</item>
+      <item>\fn</item>               <item>@fn</item>
+      <item>\ingroup</item>          <item>@ingroup</item>
+      <item>\line</item>             <item>@line</item>
+      <item>\mainpage</item>         <item>@mainpage</item>
+      <item>\name</item>             <item>@name</item>
+      <item>\overload</item>         <item>@overload</item>
+      <item>\par</item>              <item>@par</item>
+      <item>\skip</item>             <item>@skip</item>
+      <item>\skipline</item>         <item>@skipline</item>
+      <item>\typedef</item>          <item>@typedef</item>
+      <item>\until</item>            <item>@until</item>
+      <item>\var</item>              <item>@var</item>
+      <item>\vhdlflow</item>         <item>@vhdlflow</item>
     </list>
     <list name="Note">
-      <item> \note </item>             <item> @note </item>
+      <item>\note</item>             <item>@note</item>
     </list>
     <list name="Warning">
-      <item> \warning </item>          <item> @warning </item>
+      <item>\warning</item>          <item>@warning</item>
     </list>
     <list name="Attention">
-      <item> \attention </item>        <item> @attention </item>
-      <item> \bug </item>              <item> @bug </item>
+      <item>\attention</item>        <item>@attention</item>
+      <item>\bug</item>              <item>@bug</item>
     </list>
     <list name="Todo">
-      <item> \todo </item>             <item> @todo </item>
+      <item>\todo</item>             <item>@todo</item>
     </list>
 
     <contexts>
diff --git a/src/share/3rdparty/generic-highlighter/java.xml b/src/share/3rdparty/generic-highlighter/java.xml
index 64c97eefd78..6e0bfeed95d 100644
--- a/src/share/3rdparty/generic-highlighter/java.xml
+++ b/src/share/3rdparty/generic-highlighter/java.xml
@@ -3,3755 +3,3755 @@
 <language name="Java" version="2" kateversion="5.0" 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>
-			<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> 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>
+			<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>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>
+			<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> 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>
+			<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> 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>
+			<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">
diff --git a/src/share/3rdparty/generic-highlighter/makefile.xml b/src/share/3rdparty/generic-highlighter/makefile.xml
index 384e53b59ca..136374b80ca 100644
--- a/src/share/3rdparty/generic-highlighter/makefile.xml
+++ b/src/share/3rdparty/generic-highlighter/makefile.xml
@@ -16,10 +16,10 @@
           author="Per Wigren (wigren@home.se)" license="">
   <highlighting>
     <list name = "keywords" >
-      <item> include </item>
-      <item> -include </item>
-      <item> define </item>
-      <item> endef </item>
+      <item>include</item>
+      <item>-include</item>
+      <item>define</item>
+      <item>endef</item>
     </list>
     <!-- https://www.gnu.org/software/make/manual/html_node/Conditional-Syntax.html -->
     <list name="gmake_if_keywords">
@@ -33,19 +33,19 @@
     <list name="gmake_endif_keywords"><item>endif</item></list>
     <!-- bmake statements: https://www.freebsd.org/cgi/man.cgi?make(1)#INCLUDE_STATEMENTS,_CONDITIONALS_AND_FOR_LOOPS -->
     <list name="bmake_if_keywords">
-      <item> .if </item>
-      <item> .ifdef </item>
-      <item> .ifndef </item>
-      <item> .ifmake </item>
-      <item> .ifnmake </item>
+      <item>.if</item>
+      <item>.ifdef</item>
+      <item>.ifndef</item>
+      <item>.ifmake</item>
+      <item>.ifnmake</item>
     </list>
     <list name="bmake_else_keywords">
-      <item> .elif </item>
-      <item> .elifdef </item>
-      <item> .elifndef </item>
-      <item> .elifmake </item>
-      <item> .elifnmake </item>
-      <item> .else </item> <!-- TODO: anything following .else should be highlighted as an error -->
+      <item>.elif</item>
+      <item>.elifdef</item>
+      <item>.elifndef</item>
+      <item>.elifmake</item>
+      <item>.elifnmake</item>
+      <item>.else</item> <!-- TODO: anything following .else should be highlighted as an error -->
     </list>
     <list name="bmake_endif_keywords"><item>.endif</item></list>
 
@@ -64,9 +64,9 @@
       <!-- For compat bmake also handles include but this is already highlighted. <item>include</item> -->
     </list>
     <list name="bmake_message_stmt">
-      <item> .info </item>
-      <item> .warning </item>
-      <item> .error </item>
+      <item>.info</item>
+      <item>.warning</item>
+      <item>.error</item>
     </list>
     <!-- Use single element list here so that .for/.endfor also shows up in code completion -->
     <list name="bmake_for_stmt"><item>.for</item></list>
@@ -74,92 +74,92 @@
 
     <!-- https://www.freebsd.org/cgi/man.cgi?make(1)#SPECIAL_TARGETS -->
     <list name="bmake_special_targets">
-      <item> .BEGIN </item>
-      <item> .DEFAULT </item>
-      <item> .END </item>
-      <item> .ERROR </item>
-      <item> .IGNORE </item>
-      <item> .INTERRUPT </item>
-      <item> .MAIN </item>
-      <item> .MAKEFLAGS </item>
-      <item> .NOPATH </item>
-      <item> .NOTPARALLEL </item>
-      <item> .NO_PARALLEL </item>
-      <item> .OBJDIR </item>
-      <item> .ORDER </item>
-      <item> .PATH </item>
-      <item> .PHONY </item>
-      <item> .PRECIOUS </item>
-      <item> .SHELL </item>
-      <item> .SILENT </item>
-      <item> .STALE </item>
-      <item> .SUFFIXES </item>
+      <item>.BEGIN</item>
+      <item>.DEFAULT</item>
+      <item>.END</item>
+      <item>.ERROR</item>
+      <item>.IGNORE</item>
+      <item>.INTERRUPT</item>
+      <item>.MAIN</item>
+      <item>.MAKEFLAGS</item>
+      <item>.NOPATH</item>
+      <item>.NOTPARALLEL</item>
+      <item>.NO_PARALLEL</item>
+      <item>.OBJDIR</item>
+      <item>.ORDER</item>
+      <item>.PATH</item>
+      <item>.PHONY</item>
+      <item>.PRECIOUS</item>
+      <item>.SHELL</item>
+      <item>.SILENT</item>
+      <item>.STALE</item>
+      <item>.SUFFIXES</item>
     </list>
     <!-- https://www.freebsd.org/cgi/man.cgi?make(1)#SPECIAL_SOURCES_(ATTRIBUTES) -->
     <list name="bmake_special_sources">
-      <item> .EXEC </item>
-      <item> .IGNORE </item>
-      <item> .MADE </item>
-      <item> .MAKE </item>
-      <item> .META </item>
-      <item> .NOMETA </item>
-      <item> .NOMETA_CMP </item>
-      <item> .NOPATH </item>
-      <item> .NOTMAIN </item>
-      <item> .OPTIONAL </item>
-      <item> .PHONY </item>
-      <item> .PRECIOUS </item>
-      <item> .RECURSIVE </item>
-      <item> .SILENT </item>
-      <item> .USE </item>
-      <item> .USEBEFORE </item>
-      <item> .WAIT </item>
+      <item>.EXEC</item>
+      <item>.IGNORE</item>
+      <item>.MADE</item>
+      <item>.MAKE</item>
+      <item>.META</item>
+      <item>.NOMETA</item>
+      <item>.NOMETA_CMP</item>
+      <item>.NOPATH</item>
+      <item>.NOTMAIN</item>
+      <item>.OPTIONAL</item>
+      <item>.PHONY</item>
+      <item>.PRECIOUS</item>
+      <item>.RECURSIVE</item>
+      <item>.SILENT</item>
+      <item>.USE</item>
+      <item>.USEBEFORE</item>
+      <item>.WAIT</item>
     </list>
 
     <list name="bmake_other_stmts">
-      <item> .unexport-env </item>
-      <item> .unexport </item>
-      <item> .undef </item>
-      <item> .export-env </item>
-      <item> .export </item>
+      <item>.unexport-env</item>
+      <item>.unexport</item>
+      <item>.undef</item>
+      <item>.export-env</item>
+      <item>.export</item>
     </list>
 
     <list name = "functions">
-      <item> call </item>
-      <item> subst </item>
-      <item> patsubst </item>
-      <item> strip </item>
-      <item> findstring </item>
-      <item> filter </item>
-      <item> filter-out </item>
-      <item> sort </item>
-      <item> word </item>
-      <item> wordlist </item>
-      <item> words </item>
-      <item> firstword </item>
-      <item> lastword </item>
-      <item> dir </item>
-      <item> notdir </item>
-      <item> suffix </item>
-      <item> basename </item>
-      <item> addsuffix </item>
-      <item> addprefix </item>
-      <item> join </item>
-      <item> wildcard </item>
-      <item> realpath </item>
-      <item> abspath </item>
-      <item> if </item>
-      <item> or </item>
-      <item> and </item>
-      <item> foreach </item>
-      <item> value </item>
-      <item> eval </item>
-      <item> origin </item>
-      <item> flavor </item>
-      <item> shell </item>
-      <item> error </item>
-      <item> warning </item>
-      <item> info </item>
+      <item>call</item>
+      <item>subst</item>
+      <item>patsubst</item>
+      <item>strip</item>
+      <item>findstring</item>
+      <item>filter</item>
+      <item>filter-out</item>
+      <item>sort</item>
+      <item>word</item>
+      <item>wordlist</item>
+      <item>words</item>
+      <item>firstword</item>
+      <item>lastword</item>
+      <item>dir</item>
+      <item>notdir</item>
+      <item>suffix</item>
+      <item>basename</item>
+      <item>addsuffix</item>
+      <item>addprefix</item>
+      <item>join</item>
+      <item>wildcard</item>
+      <item>realpath</item>
+      <item>abspath</item>
+      <item>if</item>
+      <item>or</item>
+      <item>and</item>
+      <item>foreach</item>
+      <item>value</item>
+      <item>eval</item>
+      <item>origin</item>
+      <item>flavor</item>
+      <item>shell</item>
+      <item>error</item>
+      <item>warning</item>
+      <item>info</item>
     </list>
     <contexts>
       <context name="normal" attribute="Normal" lineEndContext="#stay">
diff --git a/src/share/3rdparty/generic-highlighter/perl.xml b/src/share/3rdparty/generic-highlighter/perl.xml
index e9fb42fac42..5b4b85bbe4c 100644
--- a/src/share/3rdparty/generic-highlighter/perl.xml
+++ b/src/share/3rdparty/generic-highlighter/perl.xml
@@ -39,88 +39,88 @@
 
    Enhance tr/// and y/// support.
 -->
-<language name="Perl" version="3" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPLv2">
+<language name="Perl" version="4" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPLv2">
   <highlighting>
     <list name="keywords">
-      <item> if </item>
-      <item> unless </item>
-      <item> else </item>
-      <item> elsif </item>
-      <item> while </item>
-      <item> until </item>
-      <item> for </item>
-      <item> each </item>
-      <item> foreach </item>
-      <item> next </item>
-      <item> last </item>
-      <item> break </item>
-      <item> continue </item>
-      <item> return </item>
-      <item> my </item>
-      <item> our </item>
-      <item> local </item>
-      <item> state </item>
-      <item> BEGIN </item>
-      <item> END </item>
-      <item> package </item>
-      <item> sub </item>
-      <item> do </item>
-      <item> given  </item>
-      <item> when  </item>
-      <item> default </item>
-      <item> __END__ </item>
-      <item> __DATA__ </item>
-      <item> __FILE__ </item>
-      <item> __LINE__ </item>
-      <item> __PACKAGE__ </item>
+      <item>if</item>
+      <item>unless</item>
+      <item>else</item>
+      <item>elsif</item>
+      <item>while</item>
+      <item>until</item>
+      <item>for</item>
+      <item>each</item>
+      <item>foreach</item>
+      <item>next</item>
+      <item>last</item>
+      <item>break</item>
+      <item>continue</item>
+      <item>return</item>
+      <item>my</item>
+      <item>our</item>
+      <item>local</item>
+      <item>state</item>
+      <item>BEGIN</item>
+      <item>END</item>
+      <item>package</item>
+      <item>sub</item>
+      <item>do</item>
+      <item>given</item>
+      <item>when</item>
+      <item>default</item>
+      <item>__END__</item>
+      <item>__DATA__</item>
+      <item>__FILE__</item>
+      <item>__LINE__</item>
+      <item>__PACKAGE__</item>
     </list>
     <list name="operators">
-      <item> = </item>
-      <item> != </item>
-      <item> ~= </item>
-      <item> += </item>
-      <item> -= </item>
-      <item> *= </item>
-      <item> /= </item>
-      <item> **= </item>
-      <item> |= </item>
-      <item> ||= </item>
-      <item> //= </item>
-      <item> &amp;= </item>
-      <item> &amp;&amp;= </item>
-      <item> ?= </item>
-      <item> + </item>
-      <item> - </item>
-      <item> * </item>
-     <!-- <item> / </item>//-->
-      <item> % </item>
-      <item> || </item>
-      <item> // </item>
-      <item> &amp;&amp; </item>
-      <item> | </item>
-      <item> &amp; </item>
-      <item> &lt; </item>
-      <item> &lt;&lt; </item>
-      <item> &gt; </item>
-      <item> &gt;&gt; </item>
-      <item> ^ </item>
-      <item> -&gt; </item>
-      <item> =&gt; </item>
-      <item> . </item>
-      <item> , </item>
-      <item> ; </item>
-      <item> :: </item>
-      <item> \ </item>
-      <item> and </item>
-      <item> or </item>
-      <item> not </item>
-      <item> eq </item>
-      <item> ne </item>
-      <item> lt </item>
-      <item> gt </item>
-      <item> le </item>
-      <item> ge </item>
-      <item> cmp </item>
+      <item>=</item>
+      <item>!=</item>
+      <item>~=</item>
+      <item>+=</item>
+      <item>-=</item>
+      <item>*=</item>
+      <item>/=</item>
+      <item>**=</item>
+      <item>|=</item>
+      <item>||=</item>
+      <item>//=</item>
+      <item>&amp;=</item>
+      <item>&amp;&amp;=</item>
+      <item>?=</item>
+      <item>+</item>
+      <item>-</item>
+      <item>*</item>
+     <!-- <item>/</item>//-->
+      <item>%</item>
+      <item>||</item>
+      <item>//</item>
+      <item>&amp;&amp;</item>
+      <item>|</item>
+      <item>&amp;</item>
+      <item>&lt;</item>
+      <item>&lt;&lt;</item>
+      <item>&gt;</item>
+      <item>&gt;&gt;</item>
+      <item>^</item>
+      <item>-&gt;</item>
+      <item>=&gt;</item>
+      <item>.</item>
+      <item>,</item>
+      <item>;</item>
+      <item>::</item>
+      <item>\</item>
+      <item>and</item>
+      <item>or</item>
+      <item>not</item>
+      <item>eq</item>
+      <item>ne</item>
+      <item>lt</item>
+      <item>gt</item>
+      <item>le</item>
+      <item>ge</item>
+      <item>cmp</item>
     </list>
     <list name="functions">
       <item>abs</item>
@@ -744,14 +744,14 @@
         <RegExpr attribute="Keyword" context="here_document_dumb" String="\s*'([^']+)'\s*;?" />
       </context>
       <context name="here_document" attribute="String (interpolated)" lineEndContext="#stay" dynamic="true">
-        <DetectSpaces />
-        <RegExpr attribute="Keyword" context="#pop#pop" String="^%1\b" column="0" dynamic="true" endRegion="HereDocument"/>
+        <RegExpr attribute="Keyword" context="#pop#pop" String="%1\b" column="0" dynamic="true" endRegion="HereDocument"/>
         <RegExpr attribute="Keyword" context="here_document" String="\=\s*&lt;&lt;\s*[&quot;']?([A-Z0-9_\-]+)[&quot;']?" beginRegion="HEREDoc" />
         <IncludeRules context="ipstring_internal" />
+        <DetectSpaces />
       </context>
       <context name="here_document_dumb" attribute="Normal Text" lineEndContext="#stay" dynamic="true">
-        <DetectSpaces />
         <RegExpr attribute="Keyword" context="#pop#pop" String="%1" column="0" dynamic="true" endRegion="HereDocument"/>
+        <DetectSpaces />
         <DetectIdentifier />
       </context>
 
diff --git a/src/share/3rdparty/generic-highlighter/ruby.xml b/src/share/3rdparty/generic-highlighter/ruby.xml
index faf1dd3c406..f1ccdc17028 100644
--- a/src/share/3rdparty/generic-highlighter/ruby.xml
+++ b/src/share/3rdparty/generic-highlighter/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="3" kateversion="3.3"
+	  version="4" kateversion="3.3"
 	  extensions="*.rb;*.rjs;*.rxml;*.xml.erb;*.js.erb;*.rake;Rakefile;Gemfile;*.gemspec;Vagrantfile"
 	  mimetype="application/x-ruby"
 	  style="ruby" indenter="ruby"
@@ -40,74 +40,74 @@
 	<highlighting>
 
 		<list name="keywords">
-			<item> BEGIN </item>
-			<item> END </item>
-			<item> and </item>
-			<item> begin </item>
-			<item> break </item>
-			<item> case </item>
-			<item> defined? </item>
-			<item> do </item>
-			<item> else </item>
-			<item> elsif </item>
-			<item> end </item>
-			<item> ensure </item>
-			<item> for </item>
-			<item> if </item>
-			<item> in </item>
-			<item> next </item>
-			<item> not </item>
-			<item> or </item>
-			<item> redo </item>
-			<item> rescue </item>
-			<item> retry </item>
-			<item> return </item>
-			<item> then </item>
-			<item> unless </item>
-			<item> until </item>
-			<item> when </item>
-			<item> yield </item>
+			<item>BEGIN</item>
+			<item>END</item>
+			<item>and</item>
+			<item>begin</item>
+			<item>break</item>
+			<item>case</item>
+			<item>defined?</item>
+			<item>do</item>
+			<item>else</item>
+			<item>elsif</item>
+			<item>end</item>
+			<item>ensure</item>
+			<item>for</item>
+			<item>if</item>
+			<item>in</item>
+			<item>next</item>
+			<item>not</item>
+			<item>or</item>
+			<item>redo</item>
+			<item>rescue</item>
+			<item>retry</item>
+			<item>return</item>
+			<item>then</item>
+			<item>unless</item>
+			<item>until</item>
+			<item>when</item>
+			<item>yield</item>
 		</list>
 
 		<list name="access-control">
-			<item> private_class_method </item>
-			<item> private </item>
-			<item> protected </item>
-			<item> public_class_method </item>
-			<item> public </item>
+			<item>private_class_method</item>
+			<item>private</item>
+			<item>protected</item>
+			<item>public_class_method</item>
+			<item>public</item>
 		</list>
 
 		<list name="attribute-definitions">
-			<item> attr_reader </item>
-			<item> attr_writer </item>
-			<item> attr_accessor </item>
+			<item>attr_reader</item>
+			<item>attr_writer</item>
+			<item>attr_accessor</item>
 		</list>
 
 		<list name="definitions">
-			<item> alias </item>
-			<item> module </item>
-			<item> class </item>
-			<item> def </item>
-			<item> undef </item>
+			<item>alias</item>
+			<item>module</item>
+			<item>class</item>
+			<item>def</item>
+			<item>undef</item>
 		</list>
 
 		<list name="pseudo-variables">
-			<item> self </item>
-			<item> super </item>
-			<item> nil </item>
-			<item> false </item>
-			<item> true </item>
-			<item> caller </item>
-			<item> __FILE__ </item>
-			<item> __LINE__ </item>
+			<item>self</item>
+			<item>super</item>
+			<item>nil</item>
+			<item>false</item>
+			<item>true</item>
+			<item>caller</item>
+			<item>__FILE__</item>
+			<item>__LINE__</item>
 		</list>
 
 		<list name="default-globals">
-			<item> $stdout </item>
-			<item> $defout </item>
-			<item> $stderr </item>
-			<item> $deferr </item>
-			<item> $stdin </item>
+			<item>$stdout</item>
+			<item>$defout</item>
+			<item>$stderr</item>
+			<item>$deferr</item>
+			<item>$stdin</item>
 		</list>
 
 		<!-- Kernel module methods.
@@ -116,67 +116,67 @@
 		-->
 		<list name="kernel-methods">
 			<!-- backquote ` -->
-			<item> abort </item>
-			<item> at_exit </item>
-			<item> autoload </item>
-			<item> autoload? </item>
-			<item> binding </item>
-			<item> block_given? </item>
-			<item> callcc </item>
-			<item> caller </item>
-			<item> catch </item>
-			<item> chomp </item>
-			<item> chomp! </item>
-			<item> chop </item>
-			<item> chop! </item>
-			<item> eval </item>
-			<item> exec </item>
-			<item> exit </item>
-			<item> exit! </item>
-			<item> fail </item>
-			<item> fork </item>
-			<item> format </item>
-			<item> getc </item>
-			<item> gets </item>
-			<item> global_variables </item>
-			<item> gsub </item>
-			<item> gsub! </item>
-			<item> iterator? </item>
-			<item> lambda </item>
-			<item> load </item>
-			<item> local_variables </item>
-			<item> loop </item>
-			<item> method_missing </item>
-			<item> open </item>
-			<item> p </item>
-			<item> print </item>
-			<item> printf </item>
-			<item> proc </item>
-			<item> putc </item>
-			<item> puts </item>
-			<item> raise </item>
-			<item> rand </item>
-			<item> readline </item>
-			<item> readlines </item>
-			<item> require </item>
-			<item> require_relative </item>
-			<item> scan </item>
-			<item> select </item>
-			<item> set_trace_func </item>
-			<item> sleep </item>
-			<item> split </item>
-			<item> sprintf </item>
-			<item> srand </item>
-			<item> sub </item>
-			<item> sub! </item>
-			<item> syscall </item>
-			<item> system </item>
-			<item> test </item>
-			<item> throw </item>
-			<item> trace_var </item>
-			<item> trap </item>
-			<item> untrace_var </item>
-			<item> warn </item>
+			<item>abort</item>
+			<item>at_exit</item>
+			<item>autoload</item>
+			<item>autoload?</item>
+			<item>binding</item>
+			<item>block_given?</item>
+			<item>callcc</item>
+			<item>caller</item>
+			<item>catch</item>
+			<item>chomp</item>
+			<item>chomp!</item>
+			<item>chop</item>
+			<item>chop!</item>
+			<item>eval</item>
+			<item>exec</item>
+			<item>exit</item>
+			<item>exit!</item>
+			<item>fail</item>
+			<item>fork</item>
+			<item>format</item>
+			<item>getc</item>
+			<item>gets</item>
+			<item>global_variables</item>
+			<item>gsub</item>
+			<item>gsub!</item>
+			<item>iterator?</item>
+			<item>lambda</item>
+			<item>load</item>
+			<item>local_variables</item>
+			<item>loop</item>
+			<item>method_missing</item>
+			<item>open</item>
+			<item>p</item>
+			<item>print</item>
+			<item>printf</item>
+			<item>proc</item>
+			<item>putc</item>
+			<item>puts</item>
+			<item>raise</item>
+			<item>rand</item>
+			<item>readline</item>
+			<item>readlines</item>
+			<item>require</item>
+			<item>require_relative</item>
+			<item>scan</item>
+			<item>select</item>
+			<item>set_trace_func</item>
+			<item>sleep</item>
+			<item>split</item>
+			<item>sprintf</item>
+			<item>srand</item>
+			<item>sub</item>
+			<item>sub!</item>
+			<item>syscall</item>
+			<item>system</item>
+			<item>test</item>
+			<item>throw</item>
+			<item>trace_var</item>
+			<item>trap</item>
+			<item>untrace_var</item>
+			<item>warn</item>
 		</list>
 
                 <list name="mixin-methods">
@@ -204,14 +204,14 @@
 				<RegExpr attribute="Keyword" String="\;\s*(while|until)\b(?!.*\bdo\b)" context="#stay" beginRegion="def block"/>
 				<RegExpr attribute="Keyword" String="(if|unless)\b" context="#stay" beginRegion="def block" firstNonSpace="true"/>
 				<RegExpr attribute="Keyword" String="\;\s*(if|unless)\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bclass\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bmodule\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bbegin\b" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="class" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="module" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="begin" context="#stay" beginRegion="def block"/>
 				<RegExpr attribute="Keyword" String="\bfor\b(?!.*\bdo\b)" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bcase\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bdo\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bdef\b" context="#stay" beginRegion="def block"/>
-				<RegExpr attribute="Keyword" String="\bend\b" context="#stay" endRegion="def block"/>
+				<WordDetect attribute="Keyword" String="case" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="do" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="def" context="#stay" beginRegion="def block"/>
+				<WordDetect attribute="Keyword" String="end" context="#stay" endRegion="def block"/>
 				<!-- elsif/else close the current block and start a new one -->
 				<RegExpr attribute="Keyword" String="\b(else|elsif|rescue|ensure)\b" context="#stay" endRegion="def block" beginRegion="def block"/>
 
diff --git a/src/share/3rdparty/generic-highlighter/xml.xml b/src/share/3rdparty/generic-highlighter/xml.xml
index 9c52be3af65..7cff05c06b9 100644
--- a/src/share/3rdparty/generic-highlighter/xml.xml
+++ b/src/share/3rdparty/generic-highlighter/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="5" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/xml;application/scxml+xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="XML" version="6" kateversion="3.4" section="Markup" extensions="*.docbook;*.xml;*.rc;*.daml;*.rdf;*.rss;*.xspf;*.xsd;*.svg;*.ui;*.kcfg;*.qrc;*.wsdl;*.scxml;*.xbel" mimetype="text/xml;text/book;text/daml;text/rdf;application/rss+xml;application/xspf+xml;image/svg+xml;application/x-designer;application/x-xbel;application/xml;application/scxml+xml" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <highlighting>
 <contexts>
diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index 8ceea1eca56..5139c8574d5 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -198,12 +198,7 @@ void IndexWindow::open(const QModelIndex &index, bool newPage)
 {
     QString keyword = m_filteredIndexModel->data(index, Qt::DisplayRole).toString();
     QMap<QString, QUrl> links = LocalHelpManager::helpEngine().indexModel()->linksForKeyword(keyword);
-
-    if (links.size() == 1) {
-        emit linkActivated(links.first(), newPage);
-    } else if (links.size() > 1) {
-        emit linksActivated(links, keyword, newPage);
-    }
+    emit linksActivated(links, keyword, newPage);
 }
 
 Qt::DropActions IndexFilterModel::supportedDragActions() const
diff --git a/src/shared/help/indexwindow.h b/src/shared/help/indexwindow.h
index aa621c22937..1b44c1f5768 100644
--- a/src/shared/help/indexwindow.h
+++ b/src/shared/help/indexwindow.h
@@ -88,7 +88,6 @@ public:
     void setOpenInNewPageActionVisible(bool visible);
 
 signals:
-    void linkActivated(const QUrl &link, bool newPage);
     void linksActivated(const QMap<QString, QUrl> &links,
         const QString &keyword, bool newPage);
 
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject 4db6418abaefe23795984a48025ede6a54ba34d
+Subproject 998c69898058a7917a35875b7c7591bba6cf9f4