diff --git a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde
index 4f88fcf84a2..cf21b3ac739 100644
--- a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde
+++ b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde
@@ -1,14 +1,19 @@
 cmake_minimum_required(VERSION 3.5)
 
-set(KF5_VERSION "5.59.0")
+set(KF5_VERSION "5.73.0")
 project(KSyntaxHighlighting VERSION ${KF5_VERSION})
 
-find_package(ECM 5.59.0 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+find_package(ECM 5.73.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 if(POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif()
 
+include(KDEInstallDirs)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+include(KDECMakeSettings)
+include(KDEClangFormat)
+
 include(FeatureSummary)
 include(GenerateExportHeader)
 include(ECMSetupVersion)
@@ -17,9 +22,6 @@ include(ECMGeneratePriFile)
 include(CMakePackageConfigHelpers)
 include(ECMPoQmTools)
 include(ECMQtDeclareLoggingCategory)
-include(KDEInstallDirs)
-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
-include(KDECMakeSettings)
 include(ECMMarkNonGuiExecutable)
 include(ECMAddQch)
 include(ECMOptionalAddSubdirectory)
@@ -34,7 +36,7 @@ ecm_setup_version(PROJECT
 #
 # Dependencies
 #
-set(REQUIRED_QT_VERSION 5.10.0)
+set(REQUIRED_QT_VERSION 5.12.0)
 find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Core Network Test)
 option(KSYNTAXHIGHLIGHTING_USE_GUI "Build components depending on Qt5Gui" ON)
 if(KSYNTAXHIGHLIGHTING_USE_GUI)
@@ -84,6 +86,7 @@ if (NO_STANDARD_PATHS)
     add_definitions(-DNO_STANDARD_PATHS)
 endif()
 add_definitions(-DQT_NO_FOREACH)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
 
 #
 # Actually build the stuff
@@ -135,6 +138,10 @@ endif()
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ksyntaxhighlighting_version.h"
         DESTINATION "${KDE_INSTALL_INCLUDEDIR_KF5}"
         COMPONENT Devel)
-install(FILES org_kde_ksyntaxhighlighting.categories DESTINATION ${KDE_INSTALL_CONFDIR})
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+# add clang-format target for all our real source files
+file(GLOB ALL_CLANG_FORMAT_TEST_FILES autotests/*.cpp autotests/*.h)
+file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES examples/*.cpp examples/*.h src/*.cpp src/*.h)
+kde_clang_format(${ALL_CLANG_FORMAT_TEST_FILES} ${ALL_CLANG_FORMAT_SOURCE_FILES})
diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/bash.xml b/src/libs/3rdparty/syntax-highlighting/data/syntax/bash.xml
index cdfdf958449..240e98b4361 100644
--- a/src/libs/3rdparty/syntax-highlighting/data/syntax/bash.xml
+++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/bash.xml
@@ -7,8 +7,9 @@
         <!ENTITY eos      "(?=($|\s))">                 <!-- eol or space following -->
         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
         <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )">     <!-- valid character in a file name -->
+        <!ENTITY charbeforecomment "[\s;]">             <!-- character before a comment # -->
 ]>
-<language name="Bash" version="9" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="11" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
 
 <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
@@ -473,6 +474,9 @@
       <!-- FindMost tries to interpret anything except commands -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindMost">
         <IncludeRules context="FindComments" />
+        <IncludeRules context="FindMostWithoutComments" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="FindMostWithoutComments">
         <IncludeRules context="FindStrings" />
         <IncludeRules context="FindSubstitutions" />
         <IncludeRules context="FindOthers" />
@@ -482,7 +486,13 @@
       <!-- FindComments consumes shell comments till EOL -->
       <context attribute="Normal Text" lineEndContext="#pop" name="FindComments">
         <DetectChar attribute="Comment" context="Comment" char="#" firstNonSpace="true"/>
-        <RegExpr attribute="Normal Text" context="Comment" String="[\s;](?=#)" />
+        <RegExpr attribute="Comment" context="Comment" String="(?&lt;=&charbeforecomment;)#" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsInCommand">
+        <DetectChar attribute="Comment" context="Comment" char="#" firstNonSpace="true"/>
+        <!-- NOTE: If a rule already matches a character of &charbeforecomment;
+             (for example, in an escaped character), the comment will not be highlighted. -->
+        <RegExpr attribute="Normal Text" context="Comment" String="&charbeforecomment;(?=#)" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="Comment">
         <IncludeRules context="##Alerts" />
@@ -492,7 +502,7 @@
       <!-- FindCommentsParen consumes shell comments till EOL or a closing parenthese -->
       <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsParen">
         <DetectChar attribute="Comment" context="CommentParen" char="#" firstNonSpace="true"/>
-        <RegExpr attribute="Normal Text" context="CommentParen" String="[\s;](?=#)" />
+        <RegExpr attribute="Normal Text" context="CommentParen" String="&charbeforecomment;(?=#)" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="CommentParen">
         <RegExpr attribute="Comment" context="#pop" String="[^)](?=\))" />
@@ -502,7 +512,7 @@
       <!-- FindCommentsBackq consumes shell comments till EOL or a backquote -->
       <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsBackq">
         <DetectChar attribute="Comment" context="CommentBackq" char="#" firstNonSpace="true"/>
-        <RegExpr attribute="Normal Text" context="CommentBackq" String="[\s;](?=#)" />
+        <RegExpr attribute="Normal Text" context="CommentBackq" String="&charbeforecomment;(?=#)" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="CommentBackq">
         <RegExpr attribute="Comment" context="#pop" String="[^`](?=`)" />
@@ -553,7 +563,8 @@
         <!-- handle here document -->
         <Detect2Chars attribute="Redirection" context="HereDoc" char="&lt;" char1="&lt;" lookAhead="true" />
         <!-- handle process subst -->
-        <RegExpr attribute="Redirection" context="ProcessSubst" String="[&lt;&gt;]\(" />
+        <Detect2Chars attribute="Redirection" context="ProcessSubst" char="&lt;" char1="(" />
+        <Detect2Chars attribute="Redirection" context="ProcessSubst" char="&gt;" char1="(" />
         <!-- handle redirection -->
         <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 || -->
@@ -567,13 +578,27 @@
         <RegExpr attribute="OtherCommand" context="#stay" String="/&pathpart;*(?=([/);$`'&quot;]|$))" />
         <RegExpr attribute="OtherCommand" context="CommandArgs" String="/&pathpart;*(?=([\s);$`'&quot;]|$))" />
         <!-- This list is not complete. ie, ":" is missing but as it is in bash completition. -->
-        <RegExpr attribute="OtherCommand" context="CommandArgs" String="&pathpart;*" />
+        <RegExpr attribute="OtherCommand" context="CommandArgsNormal" String="&pathpart;*" />
       </context>
 
       <!-- CommandArgs matches the items after a command -->
       <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgs">
-        <LineContinue />
+        <!-- In command arguments, do not allow comments after escaped characters.
+             This avoids highlighting comments within paths or other text. Ex: pathtext\ #no\ comment -->
+        <!-- FindComments -->
+        <RegExpr attribute="Control" context="#pop!Comment" String=";;?(?=#)" />
+        <IncludeRules context="FindCommentsInCommand" />
+        <IncludeRules context="FindMostWithoutComments" />
+        <IncludeRules context="DefaultCommandArgs" />
+      </context>
+      <!-- CommandArgs but with normal comments -->
+      <context attribute="Normal Text" lineEndContext="#pop" name="CommandArgsNormal">
         <IncludeRules context="FindMost" />
+        <IncludeRules context="DefaultCommandArgs" />
+      </context>
+
+      <context attribute="Normal Text" lineEndContext="#pop" name="DefaultCommandArgs">
+        <LineContinue />
         <RegExpr attribute="Keyword" context="#stay" String="\\$" />
         <!-- handle keywords -->
         <RegExpr attribute="Option" context="#stay" String="\.(?=\s)" />
@@ -582,10 +607,11 @@
         <!-- handle here document -->
         <Detect2Chars attribute="Redirection" context="HereDoc" char="&lt;" char1="&lt;" lookAhead="true" />
         <!-- handle process subst -->
-        <RegExpr attribute="Redirection" context="ProcessSubst" String="[&lt;&gt;]\(" />
+        <Detect2Chars attribute="Redirection" context="ProcessSubst" char="&lt;" char1="(" />
+        <Detect2Chars attribute="Redirection" context="ProcessSubst" char="&gt;" char1="(" />
         <!-- handle redirection -->
         <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 || -->
+        <!-- handle &, &&, |, ||, ; and ;; -->
         <RegExpr attribute="Control" context="#pop" String="([|&amp;;])\1?" />
         <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_-]*" />
diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/cmake.xml b/src/libs/3rdparty/syntax-highlighting/data/syntax/cmake.xml
index 1f476858fda..fc33e98e0e9 100644
--- a/src/libs/3rdparty/syntax-highlighting/data/syntax/cmake.xml
+++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/cmake.xml
@@ -31,7 +31,7 @@
 
 <language
     name="CMake"
-    version="22"
+    version="24"
     kateversion="2.4"
     section="Other"
     extensions="CMakeLists.txt;*.cmake;*.cmake.in"
@@ -45,6 +45,7 @@
     <list name="commands">
         <item>break</item>
         <item>cmake_host_system_information</item>
+        <item>cmake_language</item>
         <item>cmake_minimum_required</item>
         <item>cmake_parse_arguments</item>
         <item>cmake_policy</item>
@@ -185,6 +186,11 @@
       <item>TOTAL_PHYSICAL_MEMORY</item>
       <item>TOTAL_VIRTUAL_MEMORY</item>
     </list>
+    <list name="cmake_language_nargs">
+      <item>CALL</item>
+      <item>CODE</item>
+      <item>EVAL</item>
+    </list>
     <list name="cmake_minimum_required_nargs">
       <item>FATAL_ERROR</item>
       <item>VERSION</item>
@@ -218,6 +224,7 @@
     </list>
     <list name="elseif_nargs">
       <item>AND</item>
+      <item>COMMAND</item>
       <item>DEFINED</item>
       <item>EQUAL</item>
       <item>EXISTS</item>
@@ -250,6 +257,8 @@
     <list name="execute_process_nargs">
       <item>COMMAND</item>
       <item>COMMAND_ECHO</item>
+      <item>ECHO_ERROR_VARIABLE</item>
+      <item>ECHO_OUTPUT_VARIABLE</item>
       <item>ENCODING</item>
       <item>ERROR_FILE</item>
       <item>ERROR_QUIET</item>
@@ -275,8 +284,12 @@
       <item>UTF8</item>
     </list>
     <list name="file_nargs">
+      <item>@ONLY</item>
       <item>APPEND</item>
+      <item>ARCHIVE_CREATE</item>
+      <item>ARCHIVE_EXTRACT</item>
       <item>CONDITION</item>
+      <item>CONFIGURE</item>
       <item>CONFIGURE_DEPENDS</item>
       <item>CONTENT</item>
       <item>COPY</item>
@@ -285,13 +298,16 @@
       <item>DIRECTORY_PERMISSIONS</item>
       <item>DOWNLOAD</item>
       <item>ENCODING</item>
+      <item>ESCAPE_QUOTES</item>
       <item>EXCLUDE</item>
       <item>EXPECTED_HASH</item>
       <item>EXPECTED_MD5</item>
+      <item>FILES</item>
       <item>FILES_MATCHING</item>
       <item>FILE_PERMISSIONS</item>
       <item>FOLLOW_SYMLINKS</item>
       <item>FOLLOW_SYMLINK_CHAIN</item>
+      <item>FORMAT</item>
       <item>GENERATE</item>
       <item>GET_RUNTIME_DEPENDENCIES</item>
       <item>GLOB</item>
@@ -309,13 +325,16 @@
       <item>LIMIT_INPUT</item>
       <item>LIMIT_OUTPUT</item>
       <item>LIST_DIRECTORIES</item>
+      <item>LIST_ONLY</item>
       <item>LOCK</item>
       <item>LOG</item>
       <item>MAKE_DIRECTORY</item>
       <item>MD5</item>
+      <item>MTIME</item>
       <item>NETRC</item>
       <item>NETRC_FILE</item>
       <item>NEWLINE_CONSUME</item>
+      <item>NEWLINE_STYLE</item>
       <item>NO_HEX_CONVERSION</item>
       <item>NO_SOURCE_PERMISSIONS</item>
       <item>OFFSET</item>
@@ -353,19 +372,28 @@
       <item>TOUCH_NOCREATE</item>
       <item>TO_CMAKE_PATH</item>
       <item>TO_NATIVE_PATH</item>
+      <item>TYPE</item>
       <item>UPLOAD</item>
       <item>USERPWD</item>
       <item>USE_SOURCE_PERMISSIONS</item>
       <item>UTC</item>
+      <item>VERBOSE</item>
       <item>WRITE</item>
     </list>
     <list name="file_sargs">
+      <item>7zip</item>
+      <item>BZip2</item>
+      <item>CRLF</item>
+      <item>DOS</item>
       <item>FILE</item>
       <item>FUNCTION</item>
       <item>GROUP_EXECUTE</item>
       <item>GROUP_READ</item>
       <item>GROUP_WRITE</item>
+      <item>GZip</item>
       <item>IGNORED</item>
+      <item>LF</item>
+      <item>None</item>
       <item>OPTIONAL</item>
       <item>OWNER_EXECUTE</item>
       <item>OWNER_READ</item>
@@ -374,14 +402,23 @@
       <item>REQUIRED</item>
       <item>SETGID</item>
       <item>SETUID</item>
+      <item>UNIX</item>
       <item>UTF-16BE</item>
       <item>UTF-16LE</item>
       <item>UTF-32B</item>
       <item>UTF-32LE</item>
       <item>UTF-8</item>
+      <item>WIN32</item>
       <item>WORLD_EXECUTE</item>
       <item>WORLD_READ</item>
       <item>WORLD_WRITE</item>
+      <item>XZ</item>
+      <item>Zstd</item>
+      <item>gnutar</item>
+      <item>pax</item>
+      <item>paxr</item>
+      <item>raw</item>
+      <item>zip</item>
     </list>
     <list name="find_file_nargs">
       <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
@@ -398,6 +435,7 @@
       <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
       <item>PATHS</item>
       <item>PATH_SUFFIXES</item>
+      <item>REQUIRED</item>
     </list>
     <list name="find_library_nargs">
       <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
@@ -415,6 +453,7 @@
       <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
       <item>PATHS</item>
       <item>PATH_SUFFIXES</item>
+      <item>REQUIRED</item>
     </list>
     <list name="find_package_nargs">
       <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
@@ -458,6 +497,7 @@
       <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
       <item>PATHS</item>
       <item>PATH_SUFFIXES</item>
+      <item>REQUIRED</item>
     </list>
     <list name="find_program_nargs">
       <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
@@ -475,6 +515,7 @@
       <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
       <item>PATHS</item>
       <item>PATH_SUFFIXES</item>
+      <item>REQUIRED</item>
     </list>
     <list name="foreach_nargs">
       <item>IN</item>
@@ -521,11 +562,13 @@
       <item>SET</item>
       <item>SOURCE</item>
       <item>TARGET</item>
+      <item>TARGET_DIRECTORY</item>
       <item>TEST</item>
       <item>VARIABLE</item>
     </list>
     <list name="if_nargs">
       <item>AND</item>
+      <item>COMMAND</item>
       <item>DEFINED</item>
       <item>EQUAL</item>
       <item>EXISTS</item>
@@ -601,6 +644,7 @@
       <item>DESCENDING</item>
       <item>FILE_BASENAME</item>
       <item>INSENSITIVE</item>
+      <item>NATURAL</item>
       <item>SENSITIVE</item>
       <item>STRING</item>
     </list>
@@ -649,6 +693,7 @@
       <item>PROPERTY</item>
       <item>SOURCE</item>
       <item>TARGET</item>
+      <item>TARGET_DIRECTORY</item>
       <item>TEST</item>
       <item>VARIABLE</item>
     </list>
@@ -679,6 +724,7 @@
       <item>GENEX_STRIP</item>
       <item>GREATER</item>
       <item>GREATER_EQUAL</item>
+      <item>HEX</item>
       <item>JOIN</item>
       <item>LENGTH</item>
       <item>LESS</item>
@@ -722,6 +768,7 @@
     </list>
     <list name="while_nargs">
       <item>AND</item>
+      <item>COMMAND</item>
       <item>DEFINED</item>
       <item>EQUAL</item>
       <item>EXISTS</item>
@@ -866,6 +913,10 @@
       <item>NAMESPACE</item>
       <item>TARGETS</item>
     </list>
+    <list name="get_source_file_property_nargs">
+      <item>DIRECTORY</item>
+      <item>TARGET_DIRECTORY</item>
+    </list>
     <list name="include_directories_nargs">
       <item>AFTER</item>
       <item>BEFORE</item>
@@ -968,7 +1019,9 @@
       <item>Swift</item>
     </list>
     <list name="set_source_files_properties_nargs">
+      <item>DIRECTORY</item>
       <item>PROPERTIES</item>
+      <item>TARGET_DIRECTORY</item>
     </list>
     <list name="set_target_properties_nargs">
       <item>PROPERTIES</item>
@@ -1221,6 +1274,7 @@
       <item>RETURN_VALUE</item>
       <item>SCHEDULE_RANDOM</item>
       <item>START</item>
+      <item>STOP_ON_FAILURE</item>
       <item>STOP_TIME</item>
       <item>STRIDE</item>
       <item>TEST_LOAD</item>
@@ -1244,6 +1298,9 @@
     <list name="variables">
       <item>ANDROID</item>
       <item>APPLE</item>
+      <item>ARGC</item>
+      <item>ARGN</item>
+      <item>ARGV</item>
       <item>BORLAND</item>
       <item>BUILD_SHARED_LIBS</item>
       <item>BUILD_TESTING</item>
@@ -1322,6 +1379,7 @@
       <item>CMAKE_CROSS_CONFIGS</item>
       <item>CMAKE_CTEST_ARGUMENTS</item>
       <item>CMAKE_CTEST_COMMAND</item>
+      <item>CMAKE_CUDA_ARCHITECTURES</item>
       <item>CMAKE_CUDA_COMPILE_FEATURES</item>
       <item>CMAKE_CUDA_EXTENSIONS</item>
       <item>CMAKE_CUDA_HOST_COMPILER</item>
@@ -1413,6 +1471,7 @@
       <item>CMAKE_Fortran_MODDIR_FLAG</item>
       <item>CMAKE_Fortran_MODOUT_FLAG</item>
       <item>CMAKE_Fortran_MODULE_DIRECTORY</item>
+      <item>CMAKE_Fortran_PREPROCESS</item>
       <item>CMAKE_GENERATOR</item>
       <item>CMAKE_GENERATOR_INSTANCE</item>
       <item>CMAKE_GENERATOR_NO_COMPILER_ENV</item>
@@ -1424,7 +1483,6 @@
       <item>CMAKE_GLOBAL_AUTORCC_TARGET_NAME</item>
       <item>CMAKE_GNUtoMS</item>
       <item>CMAKE_HAS_ANSI_STRING_STREAM</item>
-      <item>CMAKE_HOME_DIRECTORY</item>
       <item>CMAKE_HOST_APPLE</item>
       <item>CMAKE_HOST_SOLARIS</item>
       <item>CMAKE_HOST_SYSTEM</item>
@@ -1493,7 +1551,6 @@
       <item>CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS</item>
       <item>CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP</item>
       <item>CMAKE_INSTALL_UCRT_LIBRARIES</item>
-      <item>CMAKE_INTERNAL_PLATFORM_ABI</item>
       <item>CMAKE_INTERPROCEDURAL_OPTIMIZATION</item>
       <item>CMAKE_IOS_INSTALL_COMBINED</item>
       <item>CMAKE_JOB_POOLS</item>
@@ -1535,7 +1592,6 @@
       <item>CMAKE_NETRC</item>
       <item>CMAKE_NETRC_FILE</item>
       <item>CMAKE_NINJA_OUTPUT_PATH_PREFIX</item>
-      <item>CMAKE_NOT_USING_CONFIG_FLAGS</item>
       <item>CMAKE_NO_ANSI_FOR_SCOPE</item>
       <item>CMAKE_NO_ANSI_STREAM_HEADERS</item>
       <item>CMAKE_NO_ANSI_STRING_STREAM</item>
@@ -1548,6 +1604,7 @@
       <item>CMAKE_OSX_SYSROOT</item>
       <item>CMAKE_PARENT_LIST_FILE</item>
       <item>CMAKE_PATCH_VERSION</item>
+      <item>CMAKE_PCH_WARN_INVALID</item>
       <item>CMAKE_PDB_OUTPUT_DIRECTORY</item>
       <item>CMAKE_POSITION_INDEPENDENT_CODE</item>
       <item>CMAKE_PREFIX_PATH</item>
@@ -1592,8 +1649,6 @@
       <item>CMAKE_STATIC_LINKER_FLAGS_INIT</item>
       <item>CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS</item>
       <item>CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE</item>
-      <item>CMAKE_SUPPRESS_DEVELOPER_ERRORS</item>
-      <item>CMAKE_SUPPRESS_DEVELOPER_WARNINGS</item>
       <item>CMAKE_SUPPRESS_REGENERATION</item>
       <item>CMAKE_SWIG_FLAGS</item>
       <item>CMAKE_SWIG_OUTDIR</item>
@@ -1634,7 +1689,6 @@
       <item>CMAKE_VS_GLOBALS</item>
       <item>CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD</item>
       <item>CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD</item>
-      <item>CMAKE_VS_INTEL_Fortran_PROJECT_VERSION</item>
       <item>CMAKE_VS_JUST_MY_CODE_DEBUGGING</item>
       <item>CMAKE_VS_MSBUILD_COMMAND</item>
       <item>CMAKE_VS_NsightTegra_VERSION</item>
@@ -1678,6 +1732,7 @@
       <item>CPACK_ABSOLUTE_DESTINATION_FILES</item>
       <item>CPACK_ARCHIVE_COMPONENT_INSTALL</item>
       <item>CPACK_ARCHIVE_FILE_NAME</item>
+      <item>CPACK_ARCHIVE_THREADS</item>
       <item>CPACK_BUILD_SOURCE_DIRS</item>
       <item>CPACK_BUNDLE_APPLE_CERT_APP</item>
       <item>CPACK_BUNDLE_APPLE_CODESIGN_FILES</item>
@@ -1742,9 +1797,9 @@
       <item>CPACK_DMG_SLA_LANGUAGES</item>
       <item>CPACK_DMG_VOLUME_NAME</item>
       <item>CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION</item>
-      <item>CPACK_EXT_ENABLE_STAGING</item>
-      <item>CPACK_EXT_PACKAGE_SCRIPT</item>
-      <item>CPACK_EXT_REQUESTED_VERSIONS</item>
+      <item>CPACK_EXTERNAL_ENABLE_STAGING</item>
+      <item>CPACK_EXTERNAL_PACKAGE_SCRIPT</item>
+      <item>CPACK_EXTERNAL_REQUESTED_VERSIONS</item>
       <item>CPACK_GENERATOR</item>
       <item>CPACK_IFW_ADMIN_TARGET_DIRECTORY</item>
       <item>CPACK_IFW_BINARYCREATOR_EXECUTABLE</item>
@@ -1788,7 +1843,6 @@
       <item>CPACK_INSTALL_CMAKE_PROJECTS</item>
       <item>CPACK_INSTALL_COMMANDS</item>
       <item>CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS</item>
-      <item>CPACK_INSTALL_SCRIPT</item>
       <item>CPACK_INSTALL_SCRIPTS</item>
       <item>CPACK_MONOLITHIC_INSTALL</item>
       <item>CPACK_NSIS_COMPRESSOR</item>
@@ -1807,6 +1861,7 @@
       <item>CPACK_NSIS_INSTALLED_ICON_NAME</item>
       <item>CPACK_NSIS_INSTALLER_MUI_ICON_CODE</item>
       <item>CPACK_NSIS_INSTALL_ROOT</item>
+      <item>CPACK_NSIS_MANIFEST_DPI_AWARE</item>
       <item>CPACK_NSIS_MENU_LINKS</item>
       <item>CPACK_NSIS_MODIFY_PATH</item>
       <item>CPACK_NSIS_MUI_FINISHPAGE_RUN</item>
@@ -1838,7 +1893,6 @@
       <item>CPACK_NUGET_PACKAGE_VERSION</item>
       <item>CPACK_OUTPUT_CONFIG_FILE</item>
       <item>CPACK_PACKAGE_CHECKSUM</item>
-      <item>CPACK_PACKAGE_CONTACT</item>
       <item>CPACK_PACKAGE_DESCRIPTION</item>
       <item>CPACK_PACKAGE_DESCRIPTION_FILE</item>
       <item>CPACK_PACKAGE_DESCRIPTION_SUMMARY</item>
@@ -1850,7 +1904,6 @@
       <item>CPACK_PACKAGE_INSTALL_DIRECTORY</item>
       <item>CPACK_PACKAGE_INSTALL_REGISTRY_KEY</item>
       <item>CPACK_PACKAGE_NAME</item>
-      <item>CPACK_PACKAGE_RELOCATABLE</item>
       <item>CPACK_PACKAGE_VENDOR</item>
       <item>CPACK_PACKAGE_VERSION</item>
       <item>CPACK_PACKAGE_VERSION_MAJOR</item>
@@ -1926,8 +1979,10 @@
       <item>CPACK_RPM_PACKAGE_VENDOR</item>
       <item>CPACK_RPM_PACKAGE_VERSION</item>
       <item>CPACK_RPM_POST_INSTALL_SCRIPT_FILE</item>
+      <item>CPACK_RPM_POST_TRANS_SCRIPT_FILE</item>
       <item>CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE</item>
       <item>CPACK_RPM_PRE_INSTALL_SCRIPT_FILE</item>
+      <item>CPACK_RPM_PRE_TRANS_SCRIPT_FILE</item>
       <item>CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE</item>
       <item>CPACK_RPM_RELOCATION_PATHS</item>
       <item>CPACK_RPM_SOURCE_PKG_BUILD_PARAMS</item>
@@ -2023,6 +2078,8 @@
       <item>CTEST_P4_COMMAND</item>
       <item>CTEST_P4_OPTIONS</item>
       <item>CTEST_P4_UPDATE_OPTIONS</item>
+      <item>CTEST_RESOURCE_SPEC_FILE</item>
+      <item>CTEST_RUN_CURRENT_SCRIPT</item>
       <item>CTEST_SCP_COMMAND</item>
       <item>CTEST_SITE</item>
       <item>CTEST_SOURCE_DIRECTORY</item>
@@ -2120,6 +2177,21 @@
       <item>XCODE_VERSION</item>
     </list>
 
+    <list name="deprecated-or-internal-variables">
+      <item>CMAKE_HOME_DIRECTORY</item>
+      <item>CMAKE_INTERNAL_PLATFORM_ABI</item>
+      <item>CMAKE_NOT_USING_CONFIG_FLAGS</item>
+      <item>CMAKE_SUPPRESS_DEVELOPER_ERRORS</item>
+      <item>CMAKE_SUPPRESS_DEVELOPER_WARNINGS</item>
+      <item>CMAKE_VS_INTEL_Fortran_PROJECT_VERSION</item>
+      <item>CPACK_INSTALL_PREFIX</item>
+      <item>CPACK_INSTALL_SCRIPT</item>
+      <item>CPACK_PACKAGE_CONTACT</item>
+      <item>CPACK_PACKAGE_RELOCATABLE</item>
+      <item>CPACK_TEMPORARY_DIRECTORY</item>
+      <item>CPACK_TOPLEVEL_DIRECTORY</item>
+    </list>
+
     <list name="environment-variables">
       <item>CC</item>
       <item>CFLAGS</item>
@@ -2293,6 +2365,7 @@
       <item>COMPILE_PDB_NAME</item>
       <item>COMPILE_PDB_OUTPUT_DIRECTORY</item>
       <item>CROSSCOMPILING_EMULATOR</item>
+      <item>CUDA_ARCHITECTURES</item>
       <item>CUDA_EXTENSIONS</item>
       <item>CUDA_PTX_COMPILATION</item>
       <item>CUDA_RESOLVE_DEVICE_SYMBOLS</item>
@@ -2324,6 +2397,7 @@
       <item>FRAMEWORK_VERSION</item>
       <item>Fortran_FORMAT</item>
       <item>Fortran_MODULE_DIRECTORY</item>
+      <item>Fortran_PREPROCESS</item>
       <item>GENERATOR_FILE_NAME</item>
       <item>GNUtoMS</item>
       <item>HAS_CXX</item>
@@ -2382,6 +2456,8 @@
       <item>LINK_SEARCH_START_STATIC</item>
       <item>LINK_WHAT_YOU_USE</item>
       <item>LOCATION</item>
+      <item>MACHO_COMPATIBILITY_VERSION</item>
+      <item>MACHO_CURRENT_VERSION</item>
       <item>MACOSX_BUNDLE</item>
       <item>MACOSX_BUNDLE_INFO_PLIST</item>
       <item>MACOSX_FRAMEWORK_INFO_PLIST</item>
@@ -2395,6 +2471,7 @@
       <item>OSX_COMPATIBILITY_VERSION</item>
       <item>OSX_CURRENT_VERSION</item>
       <item>OUTPUT_NAME</item>
+      <item>PCH_WARN_INVALID</item>
       <item>PDB_NAME</item>
       <item>PDB_OUTPUT_DIRECTORY</item>
       <item>POSITION_INDEPENDENT_CODE</item>
@@ -2425,6 +2502,7 @@
       <item>UNITY_BUILD_BATCH_SIZE</item>
       <item>UNITY_BUILD_CODE_AFTER_INCLUDE</item>
       <item>UNITY_BUILD_CODE_BEFORE_INCLUDE</item>
+      <item>UNITY_BUILD_MODE</item>
       <item>VERSION</item>
       <item>VISIBILITY_INLINES_HIDDEN</item>
       <item>VS_CONFIGURATION_TYPE</item>
@@ -2448,12 +2526,14 @@
       <item>VS_MOBILE_EXTENSIONS_VERSION</item>
       <item>VS_NO_SOLUTION_DEPLOY</item>
       <item>VS_PACKAGE_REFERENCES</item>
+      <item>VS_PLATFORM_TOOLSET</item>
       <item>VS_PROJECT_IMPORT</item>
       <item>VS_SCC_AUXPATH</item>
       <item>VS_SCC_LOCALPATH</item>
       <item>VS_SCC_PROJECTNAME</item>
       <item>VS_SCC_PROVIDER</item>
       <item>VS_SDK_REFERENCES</item>
+      <item>VS_SOLUTION_DEPLOY</item>
       <item>VS_USER_PROPS</item>
       <item>VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION</item>
       <item>VS_WINRT_COMPONENT</item>
@@ -2496,6 +2576,7 @@
       <item>COMPILE_OPTIONS</item>
       <item>EXTERNAL_OBJECT</item>
       <item>Fortran_FORMAT</item>
+      <item>Fortran_PREPROCESS</item>
       <item>GENERATED</item>
       <item>HEADER_FILE_ONLY</item>
       <item>INCLUDE_DIRECTORIES</item>
@@ -2520,6 +2601,7 @@
       <item>VS_DEPLOYMENT_LOCATION</item>
       <item>VS_INCLUDE_IN_VSIX</item>
       <item>VS_RESOURCE_GENERATOR</item>
+      <item>VS_SETTINGS</item>
       <item>VS_SHADER_DISABLE_OPTIMIZATIONS</item>
       <item>VS_SHADER_ENABLE_DEBUG</item>
       <item>VS_SHADER_ENTRYPOINT</item>
@@ -2609,6 +2691,10 @@
       <item>COMPILE_FEATURES</item>
       <item>COMPILE_LANG_AND_ID</item>
       <item>COMPILE_LANGUAGE</item>
+      <item>LINK_LANG_AND_ID</item>
+      <item>LINK_LANGUAGE</item>
+      <item>DEVICE_LINK</item>
+      <item>HOST_LINK</item>
       <item>ANGLE-R</item>
       <item>COMMA</item>
       <item>SEMICOLON</item>
@@ -2660,6 +2746,7 @@
         <DetectSpaces/>
         <WordDetect String="break" insensitive="true" attribute="Command" context="break_ctx" />
         <WordDetect String="cmake_host_system_information" insensitive="true" attribute="Command" context="cmake_host_system_information_ctx" />
+        <WordDetect String="cmake_language" insensitive="true" attribute="Command" context="cmake_language_ctx" />
         <WordDetect String="cmake_minimum_required" insensitive="true" attribute="Command" context="cmake_minimum_required_ctx" />
         <WordDetect String="cmake_parse_arguments" insensitive="true" attribute="Command" context="cmake_parse_arguments_ctx" />
         <WordDetect String="cmake_policy" insensitive="true" attribute="Command" context="cmake_policy_ctx" />
@@ -2667,11 +2754,11 @@
         <WordDetect String="continue" insensitive="true" attribute="Command" context="continue_ctx" />
         <WordDetect String="elseif" insensitive="true" attribute="Command" context="elseif_ctx" />
         <WordDetect String="else" insensitive="true" attribute="Command" context="else_ctx" />
-        <WordDetect String="endforeach" insensitive="true" attribute="Command" context="endforeach_ctx" />
-        <WordDetect String="endfunction" insensitive="true" attribute="Command" context="endfunction_ctx" />
-        <WordDetect String="endif" insensitive="true" attribute="Command" context="endif_ctx" />
-        <WordDetect String="endmacro" insensitive="true" attribute="Command" context="endmacro_ctx" />
-        <WordDetect String="endwhile" insensitive="true" attribute="Command" context="endwhile_ctx" />
+        <WordDetect String="endforeach" insensitive="true" attribute="Command" context="endforeach_ctx" endRegion="foreach" />
+        <WordDetect String="endfunction" insensitive="true" attribute="Command" context="endfunction_ctx" endRegion="function" />
+        <WordDetect String="endif" insensitive="true" attribute="Command" context="endif_ctx" endRegion="if" />
+        <WordDetect String="endmacro" insensitive="true" attribute="Command" context="endmacro_ctx" endRegion="macro" />
+        <WordDetect String="endwhile" insensitive="true" attribute="Command" context="endwhile_ctx" endRegion="while" />
         <WordDetect String="execute_process" insensitive="true" attribute="Command" context="execute_process_ctx" />
         <WordDetect String="file" insensitive="true" attribute="Command" context="file_ctx" />
         <WordDetect String="find_file" insensitive="true" attribute="Command" context="find_file_ctx" />
@@ -2679,17 +2766,17 @@
         <WordDetect String="find_package" insensitive="true" attribute="Command" context="find_package_ctx" />
         <WordDetect String="find_path" insensitive="true" attribute="Command" context="find_path_ctx" />
         <WordDetect String="find_program" insensitive="true" attribute="Command" context="find_program_ctx" />
-        <WordDetect String="foreach" insensitive="true" attribute="Command" context="foreach_ctx" />
-        <WordDetect String="function" insensitive="true" attribute="Command" context="function_ctx" />
+        <WordDetect String="foreach" insensitive="true" attribute="Command" context="foreach_ctx" beginRegion="foreach" />
+        <WordDetect String="function" insensitive="true" attribute="Command" context="function_ctx" beginRegion="function" />
         <WordDetect String="get_cmake_property" insensitive="true" attribute="Command" context="get_cmake_property_ctx" />
         <WordDetect String="get_directory_property" insensitive="true" attribute="Command" context="get_directory_property_ctx" />
         <WordDetect String="get_filename_component" insensitive="true" attribute="Command" context="get_filename_component_ctx" />
         <WordDetect String="get_property" insensitive="true" attribute="Command" context="get_property_ctx" />
-        <WordDetect String="if" insensitive="true" attribute="Command" context="if_ctx" />
+        <WordDetect String="if" insensitive="true" attribute="Command" context="if_ctx" beginRegion="if" />
         <WordDetect String="include" insensitive="true" attribute="Command" context="include_ctx" />
         <WordDetect String="include_guard" insensitive="true" attribute="Command" context="include_guard_ctx" />
         <WordDetect String="list" insensitive="true" attribute="Command" context="list_ctx" />
-        <WordDetect String="macro" insensitive="true" attribute="Command" context="macro_ctx" />
+        <WordDetect String="macro" insensitive="true" attribute="Command" context="macro_ctx" beginRegion="macro" />
         <WordDetect String="mark_as_advanced" insensitive="true" attribute="Command" context="mark_as_advanced_ctx" />
         <WordDetect String="math" insensitive="true" attribute="Command" context="math_ctx" />
         <WordDetect String="message" insensitive="true" attribute="Command" context="message_ctx" />
@@ -2703,7 +2790,7 @@
         <WordDetect String="string" insensitive="true" attribute="Command" context="string_ctx" />
         <WordDetect String="unset" insensitive="true" attribute="Command" context="unset_ctx" />
         <WordDetect String="variable_watch" insensitive="true" attribute="Command" context="variable_watch_ctx" />
-        <WordDetect String="while" insensitive="true" attribute="Command" context="while_ctx" />
+        <WordDetect String="while" insensitive="true" attribute="Command" context="while_ctx" beginRegion="while" />
         <WordDetect String="add_compile_definitions" insensitive="true" attribute="Command" context="add_compile_definitions_ctx" />
         <WordDetect String="add_compile_options" insensitive="true" attribute="Command" context="add_compile_options_ctx" />
         <WordDetect String="add_custom_command" insensitive="true" attribute="Command" context="add_custom_command_ctx" />
@@ -2789,6 +2876,14 @@
         <keyword attribute="Special Args" context="#stay" String="cmake_host_system_information_sargs" />
         <IncludeRules context="User Function Args" />
       </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="cmake_language_ctx">
+        <DetectChar attribute="Normal Text" context="cmake_language_ctx_op" char="(" />
+      </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="cmake_language_ctx_op">
+        <IncludeRules context="EndCmdPop2" />
+        <keyword attribute="Named Args" context="#stay" String="cmake_language_nargs" />
+        <IncludeRules context="User Function Args" />
+      </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="cmake_minimum_required_ctx">
         <DetectChar attribute="Normal Text" context="cmake_minimum_required_ctx_op" char="(" />
       </context>
@@ -3370,6 +3465,7 @@
       </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="get_source_file_property_ctx_op">
         <IncludeRules context="EndCmdPop2" />
+        <keyword attribute="Named Args" context="#stay" String="get_source_file_property_nargs" />
         <keyword attribute="Property" context="#stay" String="source-properties" />
         <IncludeRules context="Detect More source-properties" />
         <IncludeRules context="User Function Args" />
@@ -3723,6 +3819,7 @@
         <RegExpr attribute="Property" context="#stay" String="\b&id_re;_OUTPUT_NAME\b" />
         <RegExpr attribute="Property" context="#stay" String="\b&id_re;_POSTFIX\b" />
         <RegExpr attribute="Property" context="#stay" String="\bEXCLUDE_FROM_DEFAULT_BUILD_&id_re;\b" />
+        <RegExpr attribute="Property" context="#stay" String="\bFRAMEWORK_MULTI_CONFIG_POSTFIX_&id_re;\b" />
         <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_IMPLIB_&id_re;\b" />
         <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_LIBNAME_&id_re;\b" />
         <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_LINK_DEPENDENT_LIBRARIES_&id_re;\b" />
@@ -3757,6 +3854,7 @@
         <RegExpr attribute="Property" context="#stay" String="\bVS_DOTNET_REFERENCE_&id_re;\b" />
         <RegExpr attribute="Property" context="#stay" String="\bVS_DOTNET_REFERENCEPROP_&id_re;_TAG_&id_re;\b" />
         <RegExpr attribute="Property" context="#stay" String="\bVS_GLOBAL_&id_re;\b" />
+        <RegExpr attribute="Property" context="#stay" String="\bVS_SOURCE_SETTINGS_&id_re;\b" />
         <RegExpr attribute="Property" context="#stay" String="\bXCODE_ATTRIBUTE_&id_re;\b" />
       </context>
 
@@ -3784,11 +3882,16 @@
 
       <context attribute="Normal Text" lineEndContext="#stay" name="Detect Builtin Variables">
         <RegExpr attribute="Internal Name" context="#stay" String="\b_&id_re;\b" />
+        <keyword attribute="CMake Internal Variable" context="#stay" String="deprecated-or-internal-variables" insensitive="false" />
         <keyword attribute="Builtin Variable" context="#stay" String="variables" insensitive="false" />
         <IncludeRules context="Detect More Builtin Variables" />
       </context>
 
       <context attribute="Normal Text" lineEndContext="#stay" name="Detect More Builtin Variables">
+        <RegExpr attribute="CMake Internal Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_ABI\b" />
+        <RegExpr attribute="CMake Internal Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_ARCHITECTURE_ID\b" />
+        <RegExpr attribute="CMake Internal Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_VERSION_INTERNAL\b" />
+        <RegExpr attribute="CMake Internal Variable" context="#stay" String="\bCMAKE_&id_re;_PLATFORM_ID\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_BINARY_DIR\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_SOURCE_DIR\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION\b" />
@@ -3817,7 +3920,10 @@
         <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_LIBRARY_DIRS\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION_COUNT\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION_STRING\b" />
+        <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_KEYWORDS_MISSING_VALUES\b" />
+        <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_UNPARSED_ARGUMENTS\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_MODULE_NAME\b" />
+        <RegExpr attribute="Builtin Variable" context="#stay" String="\bARGV[0-9]+\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_POSTFIX\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ANDROID_TOOLCHAIN_MACHINE\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ANDROID_TOOLCHAIN_PREFIX\b" />
@@ -3827,7 +3933,6 @@
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ARCHIVE_FINISH\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_CLANG_TIDY\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER\b" />
-        <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_ABI\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_AR\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_EXTERNAL_TOOLCHAIN\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_ID\b" />
@@ -3869,7 +3974,6 @@
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_LINKER_WRAPPER_FLAG_SEP\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_LINK_EXECUTABLE\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_OUTPUT_EXTENSION\b" />
-        <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_PLATFORM_ID\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_SIMULATE_ID\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_SIMULATE_VERSION\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_SIZEOF_DATA_PTR\b" />
@@ -3883,6 +3987,7 @@
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_DISABLE_FIND_PACKAGE_&id_re;\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_EXE_LINKER_FLAGS_&id_re;\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_EXE_LINKER_FLAGS_&id_re;_INIT\b" />
+        <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_&id_re;\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_INTERPROCEDURAL_OPTIMIZATION_&id_re;\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_LIBRARY_OUTPUT_DIRECTORY_&id_re;\b" />
         <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_MAP_IMPORTED_CONFIG_&id_re;\b" />
@@ -3991,18 +4096,12 @@
 
       <context attribute="Normal Text" lineEndContext="#stay" name="Detect Variable Substitutions">
         <RegExpr attribute="Cache Variable Substitution" context="#stay" String="\$CACHE\{\s*[\w-]+\s*\}" />
-        <RegExpr attribute="Environment Variable Substitution" context="EnvVarSubst" String="\$ENV\{\s*[\w-]+\s*\}" lookAhead="true" />
+        <RegExpr attribute="Environment Variable Substitution" context="EnvVarSubst" String="\$?ENV\{" />
         <Detect2Chars attribute="Variable Substitution" context="VarSubst" char="$" char1="{" />
         <RegExpr attribute="@Variable Substitution" context="@VarSubst" String="@&id_re;@" lookAhead="true" />
       </context>
 
       <context attribute="Environment Variable Substitution" lineEndContext="#pop" name="EnvVarSubst">
-        <DetectIdentifier />
-        <DetectChar attribute="Environment Variable Substitution" context="EnvVarSubstVar" char="{" />
-        <DetectChar attribute="Environment Variable Substitution" context="#pop" char="}" />
-      </context>
-
-      <context attribute="Environment Variable Substitution" lineEndContext="#pop" name="EnvVarSubstVar">
         <keyword attribute="Standard Environment Variable" context="#stay" String="environment-variables" insensitive="false" />
         <RegExpr attribute="Standard Environment Variable" context="#stay" String="\b&id_re;_DIR\b" />
         <RegExpr attribute="Standard Environment Variable" context="#stay" String="\b&id_re;_ROOT\b" />
@@ -4010,7 +4109,8 @@
         <RegExpr attribute="Standard Environment Variable" context="#stay" String="\bASM&id_re;FLAGS\b" />
         <RegExpr attribute="Standard Environment Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_LAUNCHER\b" />
         <DetectIdentifier />
-        <DetectChar attribute="Environment Variable Substitution" context="#pop#pop" char="}" />
+        <IncludeRules context="Detect Variable Substitutions" />
+        <DetectChar attribute="Environment Variable Substitution" context="#pop" char="}" />
       </context>
 
       <context attribute="Variable Substitution" lineEndContext="#pop" name="VarSubst">
@@ -4021,6 +4121,7 @@
       </context>
 
       <context attribute="@Variable Substitution" lineEndContext="#pop" name="@VarSubst">
+        <IncludeRules context="Detect Builtin Variables" />
         <DetectChar attribute="@Variable Substitution" context="VarSubst@" char="@" />
       </context>
 
@@ -4067,6 +4168,7 @@
       </context>
 
       <context attribute="Comment" lineEndContext="#stay" name="Bracketed Comment" dynamic="true">
+        <LineContinue attribute="Comment" context="#stay" />
         <RegExpr attribute="Comment" context="#pop" String=".*\]%1\]" dynamic="true" />
         <IncludeRules context="##Alerts" />
         <IncludeRules context="##Modelines" />
@@ -4111,6 +4213,7 @@
       <itemData name="Strings" defStyleNum="dsString" spellChecking="true" />
       <itemData name="Escapes" defStyleNum="dsChar" spellChecking="false" />
       <itemData name="Builtin Variable" defStyleNum="dsDecVal" color="#c09050" selColor="#c09050" spellChecking="false" />
+      <itemData name="CMake Internal Variable" defStyleNum="dsDecVal" color="#303030" selColor="#303030" spellChecking="false" />
       <itemData name="Internal Name" defStyleNum="dsDecVal" color="#303030" selColor="#303030" spellChecking="false" />
       <itemData name="Variable Substitution" defStyleNum="dsDecVal" spellChecking="false" />
       <itemData name="@Variable Substitution" defStyleNum="dsBaseN" spellChecking="false" />
diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/doxygen.xml b/src/libs/3rdparty/syntax-highlighting/data/syntax/doxygen.xml
index a6abda92047..a434f0f263a 100644
--- a/src/libs/3rdparty/syntax-highlighting/data/syntax/doxygen.xml
+++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/doxygen.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE language SYSTEM "language.dtd"
 [
     <!ENTITY wordsep "([][,?;()]|\.$|\.?\s)">     <!-- things that end a TagWord -->
+    <!ENTITY sl_word ".*?(?=&wordsep;)">
+    <!ENTITY ml_word ".*?(?=&wordsep;|\*/)">
 ]>
 <language name="Doxygen"
-          version="6"
+          version="7"
           kateversion="5.0"
           section="Markup"
           extensions="*.dox;*.doxygen"
@@ -42,10 +44,6 @@
       <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>
       <!-- TODO @internal is a candidate to be handled separately, cuz may introduce folding region -->
@@ -84,21 +82,6 @@
       <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>
     </list>
 
     <list name="TagWord">
@@ -202,6 +185,12 @@
       <item>\var</item>              <item>@var</item>
       <item>\vhdlflow</item>         <item>@vhdlflow</item>
     </list>
+    <list name="TagEnd">
+      <item>\endcode</item>          <item>@endcode</item>
+      <item>\endverbatim</item>      <item>@endverbatim</item>
+      <item>\endmsc</item>           <item>@endmsc</item>
+      <item>\enddot</item>           <item>@enddot</item>
+    </list>
     <list name="Note">
       <item>\note</item>             <item>@note</item>
     </list>
@@ -231,8 +220,8 @@
       TODO Not all commands are handled properly nowadays :( Need few more contexts...
     -->
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
-        <RegExpr attribute="Comment" context="LineComment" String="//(!|(/(?=[^/]|$)))&lt;?" />
-        <RegExpr attribute="Comment" context="BlockComment" String="/\*(\*[^*/]|!|[*!]&lt;|\*$)" beginRegion="BlockComment" />
+        <RegExpr attribute="Comment" context="LineComment" String="//(?:!|(?:/(?=[^/]|$)))&lt;?" />
+        <RegExpr attribute="Comment" context="BlockComment" String="/\*(?:\*[^*/]|!|[*!]&lt;|\*$)" beginRegion="BlockComment" />
         <RegExpr attribute="Region" context="#stay" String="//\s*@\{\s*$" beginRegion="MemberGroup" />
         <RegExpr attribute="Region" context="#stay" String="//\s*@\}\s*$"   endRegion="MemberGroup" />
         <RegExpr attribute="Region" context="#stay" String="/\*\s*@\{\s*\*/" beginRegion="MemberGroup" />
@@ -242,38 +231,21 @@
         <LineContinue attribute="Comment" context="#stay" />
         <DetectSpaces />
         <IncludeRules context="##Alerts" />
-        <IncludeRules context="SL_DetectEnv" />
-        <keyword attribute="Tags" context="#stay" String="TagOnly" />
-        <keyword attribute="Tags" context="SL_TagWord" String="TagWord" />
-        <keyword attribute="Tags" context="SL_TagParam" String="TagParam" />
-        <keyword attribute="Tags" context="SL_TagWordWord" String="TagWordWord" />
-        <keyword attribute="Tags" context="SL_TagString" String="TagString" />
-        <keyword attribute="Tags" context="SL_TagWordString" String="TagWordString" />
-        <RegExpr attribute="Custom Tags" context="#stay" String="[@\\][^@\\ \t]+" />
         <DetectIdentifier />
-        <StringDetect attribute="HTML Comment" context="SL_htmlcomment" String="&lt;!--" />
-        <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
-        <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[-\w0-9._:@]+" />
+        <DetectChar attribute="Comment" context="SL_StartTag" char="\" lookAhead="true" />
+        <DetectChar attribute="Comment" context="SL_StartTag" char="@" lookAhead="true" />
+        <DetectChar attribute="Comment" context="SL_StartHTMLTag" char="&lt;" lookAhead="true" />
+        <DetectChar attribute="Comment" context="Entities" char="&amp;" lookAhead="true" />
       </context>
       <context attribute="Comment" lineEndContext="#stay" name="BlockComment">
         <DetectSpaces />
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="BlockComment" />
         <IncludeRules context="##Alerts" />
-        <Detect2Chars attribute="Region" context="#stay" char="@" char1="{" beginRegion="Group" />
-        <Detect2Chars attribute="Region" context="#stay" char="@" char1="}" endRegion="Group" />
-        <IncludeRules context="SL_DetectEnv" />
-        <keyword attribute="Tags" context="#stay" String="TagOnly" />
-        <keyword attribute="Tags" context="ML_TagWord" String="TagWord" />
-        <keyword attribute="Tags" context="ML_TagParam" String="TagParam" />
-        <keyword attribute="Tags" context="ML_TagWordWord" String="TagWordWord" />
-        <keyword attribute="Tags" context="ML_TagString" String="TagString" />
-        <keyword attribute="Tags" context="ML_TagWordString" String="TagWordString" />
-        <RegExpr attribute="Custom Tags" context="#stay" String="[@\\]([^@\\ \t\*]|\*(?!/))+" />
         <DetectIdentifier />
-        <RegExpr attribute="Tags" context="#stay" String="\\(&lt;|&gt;)" />
-        <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
-        <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[-\w0-9._:@]+" />
-        <StringDetect attribute="HTML Comment" context="ML_htmlcomment" String="&lt;!--" />
+        <DetectChar attribute="Comment" context="ML_StartTag" char="\" lookAhead="true" />
+        <DetectChar attribute="Comment" context="ML_StartTag" char="@" lookAhead="true" />
+        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="BlockComment" />
+        <DetectChar attribute="Comment" context="ML_StartHTMLTag" char="&lt;" lookAhead="true" />
+        <DetectChar attribute="Comment" context="Entities" char="&amp;" lookAhead="true" />
       </context>
 
       <!-- NOTE: all contexts beginning with ML_ are for multiline comments
@@ -284,123 +256,254 @@
                  much more complex and very hard to understand! (But use IncludeRules where the rules don't
                  refer to another SL_*/ML_* context, to help maintainability.)
       -->
+      <context attribute="Comment" lineEndContext="#pop" name="ML_StartTag">
+        <keyword attribute="Tags" context="#pop!ML_TagWord" String="TagWord" />
+        <keyword attribute="Tags" context="#pop!ML_TagParam" String="TagParam" />
+        <keyword attribute="Tags" context="#pop!ML_TagWordWord" String="TagWordWord" />
+        <keyword attribute="Tags" context="#pop!ML_TagString" String="TagString" />
+        <keyword attribute="Tags" context="#pop!ML_TagWordString" String="TagWordString" />
+        <WordDetect attribute="Tags" context="#pop!ML_Code" String="\code" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!ML_Code" String="@code" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!ML_Verbatim" String="\verbatim" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!ML_Verbatim" String="@verbatim" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!ML_Formula" String="\f[" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!ML_Formula" String="@f[" beginRegion="VerbatimBlock" />
+        <StringDetect attribute="Tags" context="#pop!ML_FormulaShort" String="\f$" beginRegion="VerbatimBlock" />
+        <StringDetect attribute="Tags" context="#pop!ML_FormulaShort" String="@f$" beginRegion="VerbatimBlock" />
+        <StringDetect attribute="Tags" context="#pop!ML_FormulaEnv" String="\f{" beginRegion="VerbatimBlock" />
+        <StringDetect attribute="Tags" context="#pop!ML_FormulaEnv" String="@f{" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!ML_Msc" String="\msc" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!ML_Msc" String="@msc" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!ML_Dot" String="\dot" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!ML_Dot" String="@dot" beginRegion="VerbatimBlock" />
+        <IncludeRules context="Inc_OtherTag" />
+      </context>
+      <context attribute="Comment" lineEndContext="#pop" name="ML_StartHTMLTag">
+        <Detect2Chars attribute="Comment" context="#pop" char="&lt;" char1="&lt;" />
+        <RegExpr attribute="HTML Tag" context="#pop!ML_htmltag" String="&lt;\/?[-\w0-9._:@]+" />
+        <StringDetect attribute="HTML Comment" context="#pop!ML_htmlcomment" String="&lt;!--" />
+        <DetectChar attribute="Comment" context="#pop" char="&lt;" />
+      </context>
+
       <!-- tag contexts -->
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagWord">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
-        <IncludeRules context="SL_TagWord" />
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="BlockComment" />
+        <keyword attribute="Tags" context="#pop!ML_TagWord" String="TagWord" />
+        <IncludeRules context="ML_Inc_Word" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagParam">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <DetectSpaces />
-        <StringDetect attribute="Tags" context="ML_Tag2ndWord" String="[in]" />
-        <StringDetect attribute="Tags" context="ML_Tag2ndWord" String="[out]" />
-        <StringDetect attribute="Tags" context="ML_Tag2ndWord" String="[in,out]" />
-        <RegExpr attribute="Word" context="#pop" String="\S(?=&wordsep;)" />
-        <RegExpr attribute="Word" context="#stay" String="\S" />
+        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="BlockComment" />
+        <StringDetect attribute="Tags" context="#pop!ML_TagWord" String="[in]" />
+        <StringDetect attribute="Tags" context="#pop!ML_TagWord" String="[out]" />
+        <StringDetect attribute="Tags" context="#pop!ML_TagWord" String="[in,out]" />
+        <IncludeRules context="ML_Inc_Word" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagWordWord">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
         <DetectSpaces />
-        <RegExpr attribute="Word" context="ML_Tag2ndWord" String="\S(?=&wordsep;)" />
-        <RegExpr attribute="Word" context="#stay" String="\S" />
-      </context>
-      <!-- TODO for kate 2.x, convert references to "#pop!ML_TagWord" -->
-      <context attribute="Comment" lineEndContext="#pop#pop" name="ML_Tag2ndWord">
-        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" lookAhead="true" />
-        <IncludeRules context="SL_Tag2ndWord" />
+        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="BlockComment" />
+        <RegExpr attribute="Word" context="#pop!ML_TagWord" String="&ml_word;" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagString">
         <DetectSpaces />
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
+        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="BlockComment" />
         <StringDetect attribute="HTML Comment" context="ML_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
         <RegExpr attribute="HTML Tag" context="ML_htmltag" String="&lt;\/?[-\w0-9._:@]+" />
-        <RegExpr attribute="Description" context="#stay" String="." />
+        <RegExpr attribute="Description" context="#stay" String="[&lt;*]?[^&lt;*\s]+" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="ML_TagWordString">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
-        <IncludeRules context="SL_TagWordString" />
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="BlockComment" />
+        <IncludeRules context="ML_Inc_Word" />
       </context>
 
+      <context name="ML_Inc_Word" attribute="Word" lineEndContext="#pop">
+        <RegExpr attribute="Word" context="#pop" String="&ml_word;" />
+      </context>
+
+
       <!-- html contexts -->
       <context name="ML_htmltag" attribute="Identifier" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
+        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="BlockComment" />
         <Detect2Chars attribute="HTML Tag" context="#pop" char="/" char1="&gt;" />
         <DetectChar attribute="HTML Tag" context="#pop" char="&gt;" />
-        <RegExpr attribute="Identifier" context="ML_identifiers" String="\s*=\s*" />
+        <DetectSpaces />
+        <DetectChar attribute="Identifier" context="ML_identifiers" char="=" />
       </context>
       <context name="ML_htmlcomment" attribute="HTML Comment" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="BlockComment" />
         <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
         <StringDetect attribute="HTML Comment" context="#pop" String="--&gt;" />
       </context>
       <context name="ML_identifiers" attribute="Identifier" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
-        <RegExpr attribute="Identifier" context="#pop" String="\s*#?[a-zA-Z0-9]*" />
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop#pop#pop" char="*" char1="/" endRegion="BlockComment" />
         <DetectChar attribute="Types" context="ML_types1" char="'" />
         <DetectChar attribute="Types" context="ML_types2" char="&quot;" />
       </context>
       <context name="ML_types1" attribute="Types" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
+        <Detect2Chars attribute="Comment" context="#pop#pop#pop#pop" char="*" char1="/" endRegion="BlockComment" />
         <DetectChar attribute="Types" context="#pop#pop" char="'" />
       </context>
       <context name="ML_types2" attribute="Types" lineEndContext="#stay">
-        <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true" />
+        <Detect2Chars attribute="Comment" context="#pop#pop#pop#pop" char="*" char1="/" endRegion="BlockComment" />
         <DetectChar attribute="Types" context="#pop#pop" char="&quot;" />
       </context>
 
+      <context name="ML_FindNextLine" attribute="Comment" lineEndContext="#pop" fallthroughContext="#pop">
+        <DetectSpaces />
+        <Detect2Chars attribute="Comment" context="#pop!ML_End_BlockComment" char="*" char1="/" endRegion="VerbatimBlock" lookAhead="1"/>
+        <Detect2Chars attribute="Comment" context="ML_VerbatimPrefix" char="*" char1="*" lookAhead="true" />
+        <DetectChar attribute="Comment" context="#pop" char="*" />
+      </context>
+      <context name="ML_VerbatimPrefix" attribute="Comment" lineEndContext="#stay">
+        <DetectChar attribute="Comment" context="#pop" char="*" />
+      </context>
+
+      <context name="ML_End_BlockComment" attribute="Comment" lineEndContext="#stay">
+        <Detect2Chars attribute="Error" context="#pop#pop#pop" char="*" char1="/" endRegion="BlockComment"/>
+      </context>
+
+      <context name="ML_Code" attribute="Code" lineEndContext="ML_FindNextLine">
+        <Detect2Chars attribute="Comment" context="ML_End_BlockComment" char="*" char1="/" endRegion="VerbatimBlock" lookAhead="1"/>
+        <WordDetect attribute="Tags" context="#pop" String="\endcode" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@endcode" endRegion="VerbatimBlock" />
+      </context>
+
+      <context name="ML_Verbatim" attribute="Verbatim" lineEndContext="ML_FindNextLine">
+        <Detect2Chars attribute="Comment" context="ML_End_BlockComment" char="*" char1="/" endRegion="VerbatimBlock" lookAhead="1"/>
+        <WordDetect attribute="Tags" context="#pop" String="\endverbatim" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@endverbatim" endRegion="VerbatimBlock" />
+      </context>
+
+      <context name="ML_Formula" attribute="Formulas" lineEndContext="ML_FindNextLine">
+        <Detect2Chars attribute="Comment" context="ML_End_BlockComment" char="*" char1="/" endRegion="VerbatimBlock" lookAhead="1"/>
+        <WordDetect attribute="Tags" context="#pop" String="\f]" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@f]" endRegion="VerbatimBlock" />
+        <!-- TODO: How to force LaTeX math context here?? -->
+        <!-- <IncludeRules context="##LaTeX" /> -->
+      </context>
+
+      <context name="ML_FormulaShort" attribute="Formulas" lineEndContext="ML_FindNextLine">
+        <Detect2Chars attribute="Comment" context="ML_End_BlockComment" char="*" char1="/" endRegion="VerbatimBlock" lookAhead="1"/>
+        <WordDetect attribute="Tags" context="#pop" String="\f$" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@f$" endRegion="VerbatimBlock" />
+        <!-- TODO: How to force LaTeX math context here?? -->
+        <!-- <IncludeRules context="##LaTeX" /> -->
+      </context>
+
+      <context name="ML_FormulaEnv" attribute="Word" lineEndContext="ML_FindNextLine">
+        <DetectChar attribute="Tags" context="#pop!ML_FormulaEnvStart" char="}" />
+        <Detect2Chars attribute="Comment" context="ML_End_BlockComment" char="*" char1="/" endRegion="VerbatimBlock" lookAhead="1"/>
+      </context>
+
+      <context name="ML_FormulaEnvStart" attribute="Formulas" lineEndContext="ML_FindNextLine" fallthroughContext="#pop!ML_FormulaEnvFormula">
+        <DetectSpaces attribute="Comment" />
+        <DetectChar attribute="Tags" context="#pop!ML_FormulaEnvFormula" char="{" />
+        <Detect2Chars attribute="Comment" context="ML_End_BlockComment" char="*" char1="/" endRegion="VerbatimBlock" lookAhead="1"/>
+      </context>
+
+      <context name="ML_FormulaEnvFormula" attribute="Formulas" lineEndContext="ML_FindNextLine">
+        <Detect2Chars attribute="Comment" context="ML_End_BlockComment" char="*" char1="/" endRegion="VerbatimBlock" lookAhead="1"/>
+        <WordDetect attribute="Tags" context="#pop" String="\f}" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@f}" endRegion="VerbatimBlock" />
+        <!-- TODO: How to force LaTeX math context here?? -->
+        <!-- <IncludeRules context="##LaTeX" /> -->
+      </context>
+
+      <context name="ML_Msc" attribute="Message Sequence Chart" lineEndContext="ML_FindNextLine">
+        <Detect2Chars attribute="Comment" context="ML_End_BlockComment" char="*" char1="/" endRegion="VerbatimBlock" lookAhead="1"/>
+        <WordDetect attribute="Tags" context="#pop" String="\endmsc" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@endmsc" endRegion="VerbatimBlock" />
+      </context>
+
+      <context name="ML_Dot" attribute="Dot Graph" lineEndContext="ML_FindNextLine">
+        <Detect2Chars attribute="Comment" context="ML_End_BlockComment" char="*" char1="/" endRegion="VerbatimBlock" lookAhead="1"/>
+        <WordDetect attribute="Tags" context="#pop" String="\enddot" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@enddot" endRegion="VerbatimBlock" />
+      </context>
+
       <!-- NOTE: all contexts beginning with SL_ are for singleline comments -->
+      <context attribute="Comment" lineEndContext="#pop" name="SL_StartTag">
+        <keyword attribute="Tags" context="#pop!SL_TagWord" String="TagWord" />
+        <keyword attribute="Tags" context="#pop!SL_TagParam" String="TagParam" />
+        <keyword attribute="Tags" context="#pop!SL_TagWordWord" String="TagWordWord" />
+        <keyword attribute="Tags" context="#pop!SL_TagString" String="TagString" />
+        <keyword attribute="Tags" context="#pop!SL_TagWordString" String="TagWordString" />
+        <WordDetect attribute="Tags" context="#pop!SL_Code" String="\code" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!SL_Code" String="@code" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!SL_Verbatim" String="\verbatim" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!SL_Verbatim" String="@verbatim" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!SL_Formula" String="\f[" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!SL_Formula" String="@f[" beginRegion="VerbatimBlock" />
+        <StringDetect attribute="Tags" context="#pop!SL_FormulaShort" String="\f$" beginRegion="VerbatimBlock" />
+        <StringDetect attribute="Tags" context="#pop!SL_FormulaShort" String="@f$" beginRegion="VerbatimBlock" />
+        <StringDetect attribute="Tags" context="#pop!SL_FormulaEnv" String="\f{" beginRegion="VerbatimBlock" />
+        <StringDetect attribute="Tags" context="#pop!SL_FormulaEnv" String="@f{" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!SL_Msc" String="\msc" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!SL_Msc" String="@msc" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!SL_Dot" String="\dot" beginRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop!SL_Dot" String="@dot" beginRegion="VerbatimBlock" />
+        <IncludeRules context="Inc_OtherTag" />
+      </context>
+      <context attribute="Comment" lineEndContext="#pop" name="SL_StartHTMLTag">
+        <Detect2Chars attribute="Comment" context="#pop" char="&lt;" char1="&lt;" />
+        <RegExpr attribute="HTML Tag" context="#pop!SL_htmltag" String="&lt;\/?[-\w0-9._:@]+" />
+        <StringDetect attribute="HTML Comment" context="#pop!SL_htmlcomment" String="&lt;!--" />
+        <DetectChar attribute="Comment" context="#pop" char="&lt;" />
+      </context>
+
       <!-- tag contexts -->
       <context attribute="Comment" lineEndContext="#pop" name="SL_TagWord">
         <DetectSpaces />
-        <keyword attribute="Tags" context="#pop" String="TagWord" lookAhead="true" />
-        <RegExpr attribute="Word" context="#pop" String="\S(?=&wordsep;)" />
-        <RegExpr attribute="Word" context="#stay" String="\S" />
+        <keyword attribute="Tags" context="#pop!SL_TagWord" String="TagWord" />
+        <IncludeRules context="SL_Inc_Word" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="SL_TagParam">
         <DetectSpaces />
-        <StringDetect attribute="Tags" context="SL_Tag2ndWord" String="[in]" />
-        <StringDetect attribute="Tags" context="SL_Tag2ndWord" String="[out]" />
-        <StringDetect attribute="Tags" context="SL_Tag2ndWord" String="[in,out]" />
-        <RegExpr attribute="Word" context="#pop" String="\S(?=&wordsep;)" />
-        <RegExpr attribute="Word" context="#stay" String="\S" />
+        <StringDetect attribute="Tags" context="#pop!SL_TagWord" String="[in]" />
+        <StringDetect attribute="Tags" context="#pop!SL_TagWord" String="[out]" />
+        <StringDetect attribute="Tags" context="#pop!SL_TagWord" String="[in,out]" />
+        <IncludeRules context="SL_Inc_Word" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="SL_TagWordWord">
         <DetectSpaces />
-        <RegExpr attribute="Word" context="SL_Tag2ndWord" String="\S(?=&wordsep;)" />
-        <RegExpr attribute="Word" context="#stay" String="\S" />
-      </context>
-      <!-- TODO for kate 2.x, convert references to "#pop!SL_TagWord" -->
-      <context attribute="Comment" lineEndContext="#pop#pop" name="SL_Tag2ndWord">
-        <DetectSpaces />
-        <RegExpr attribute="Word" context="#pop#pop" String="\S(?=&wordsep;)" />
-        <RegExpr attribute="Word" context="#stay" String="\S" />
+        <RegExpr attribute="Word" context="#pop!SL_TagWord" String="&sl_word;" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="SL_TagString">
         <DetectSpaces />
         <StringDetect attribute="HTML Comment" context="SL_htmlcomment" String="&lt;!--" />
         <Detect2Chars attribute="Comment" context="#stay" char="&lt;" char1="&lt;" />
         <RegExpr attribute="HTML Tag" context="SL_htmltag" String="&lt;\/?[-\w0-9._:@]+" />
-        <RegExpr attribute="Description" context="#stay" String="." />
+        <RegExpr attribute="Description" context="#stay" String="&lt;?[^&lt;\s]+" />
       </context>
       <context attribute="Comment" lineEndContext="#pop" name="SL_TagWordString">
         <DetectSpaces />
-        <RegExpr attribute="Word" context="#pop" String="\S(?=&wordsep;)" />
-        <RegExpr attribute="Word" context="#stay" String="\S" />
+        <IncludeRules context="SL_Inc_Word" />
+      </context>
+      <context name="SL_Inc_Word" attribute="Word" lineEndContext="#pop">
+        <RegExpr attribute="Word" context="#pop" String="&sl_word;" />
       </context>
 
       <!-- html contexts -->
       <context name="SL_htmltag" attribute="Identifier" lineEndContext="#pop">
         <Detect2Chars attribute="HTML Tag" context="#pop" char="/" char1="&gt;" />
         <DetectChar attribute="HTML Tag" context="#pop" char="&gt;" />
-        <RegExpr attribute="Identifier" context="SL_identifiers" String="\s*=\s*" />
+        <DetectSpaces />
+        <DetectChar attribute="Identifier" context="SL_identifiers" char="=" />
       </context>
       <context name="SL_htmlcomment" attribute="HTML Comment" lineEndContext="#pop">
+        <DetectSpaces />
         <IncludeRules context="##Alerts" />
+        <DetectIdentifier />
         <StringDetect attribute="HTML Comment" context="#pop" String="--&gt;" />
       </context>
       <context name="SL_identifiers" attribute="Identifier" lineEndContext="#pop">
-        <RegExpr attribute="Identifier" context="#pop" String="\s*#?[a-zA-Z0-9]*" />
+        <DetectSpaces />
         <DetectChar attribute="Types" context="SL_types1" char="'" />
         <DetectChar attribute="Types" context="SL_types2" char="&quot;" />
       </context>
@@ -411,50 +514,88 @@
         <DetectChar attribute="Types" context="#pop#pop" char="&quot;" />
       </context>
 
-      <context attribute="Comment" name="SL_DetectEnv" lineEndContext="#pop">
-        <RegExpr attribute="Tags" context="Code" String="[@\\]code\b" beginRegion="Code" />
-        <RegExpr attribute="Tags" context="Verbatim" String="[@\\]verbatim\b" beginRegion="Verbatim" />
-        <RegExpr attribute="Tags" context="Formula" String="[@\\]f\[" beginRegion="Formula" />
-        <RegExpr attribute="Tags" context="Msc" String="[@\\]msc\b" beginRegion="Msc" />
-        <RegExpr attribute="Tags" context="Dot" String="[@\\]dot\b" beginRegion="Dot" />
-        <keyword attribute="Note" context="#stay" String="Note" />
-        <keyword attribute="Warning" context="#stay" String="Warning" />
-        <keyword attribute="Attention" context="#stay" String="Attention" />
-        <keyword attribute="Todo" context="#stay" String="Todo" />
-        <RegExpr attribute="Entities" context="#stay" String="&amp;[A-Za-z]+&#59;" />
+      <context name="SL_FindNextLine" attribute="Normal Text" lineEndContext="#stay" fallthroughContext="#pop#pop#pop">
+        <DetectSpaces />
+        <StringDetect attribute="Comment" context="#pop" String="///" />
+        <StringDetect attribute="Comment" context="#pop" String="//!" />
+        <RegExpr attribute="Comment" context="#pop#pop#pop" String="." lookAhead="true" endRegion="VerbatimBlock" />
       </context>
 
-      <context attribute="Comment" name="SL_DetectComment" lineEndContext="#pop">
-        <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="BlockComment" />
-        <DetectChar attribute="Comment" context="#stay" char="*" />
-        <StringDetect attribute="Comment" context="#stay" String="///" />
+      <context name="SL_Code" attribute="Code" lineEndContext="SL_FindNextLine">
+        <WordDetect attribute="Tags" context="#pop" String="\endcode" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@endcode" endRegion="VerbatimBlock" />
       </context>
 
-      <context attribute="Code" lineEndContext="#stay" name="Code">
-        <IncludeRules context="SL_DetectComment" />
-        <RegExpr attribute="Tags" context="#pop" String="[@\\]endcode\b" endRegion="Code" />
+      <context name="SL_Verbatim" attribute="Verbatim" lineEndContext="SL_FindNextLine">
+        <WordDetect attribute="Tags" context="#pop" String="\endverbatim" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@endverbatim" endRegion="VerbatimBlock" />
       </context>
 
-      <context attribute="Verbatim" lineEndContext="#stay" name="Verbatim">
-        <IncludeRules context="SL_DetectComment" />
-        <RegExpr attribute="Tags" context="#pop" String="[@\\]endverbatim\b" endRegion="Verbatim" />
-      </context>
-
-      <context attribute="Formulas" lineEndContext="#stay" name="Formula">
-        <IncludeRules context="SL_DetectComment" />
-        <RegExpr attribute="Tags" context="#pop" String="[@\\]f\]" endRegion="Formula" />
+      <context name="SL_Formula" attribute="Formulas" lineEndContext="SL_FindNextLine">
+        <WordDetect attribute="Tags" context="#pop" String="\f]" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@f]" endRegion="VerbatimBlock" />
         <!-- TODO: How to force LaTeX math context here?? -->
         <!-- <IncludeRules context="##LaTeX" /> -->
       </context>
 
-      <context attribute="Message Sequence Chart" lineEndContext="#stay" name="Msc">
-        <IncludeRules context="SL_DetectComment" />
-        <RegExpr attribute="Tags" context="#pop" String="[@\\]endmsc\b" endRegion="Msc" />
+      <context name="SL_FormulaShort" attribute="Formulas" lineEndContext="SL_FindNextLine">
+        <StringDetect attribute="Tags" context="#pop" String="\f$" endRegion="VerbatimBlock" />
+        <StringDetect attribute="Tags" context="#pop" String="@f$" endRegion="VerbatimBlock" />
+        <!-- TODO: How to force LaTeX math context here?? -->
+        <!-- <IncludeRules context="##LaTeX" /> -->
       </context>
 
-      <context attribute="Dot Graph" lineEndContext="#stay" name="Dot">
-        <IncludeRules context="SL_DetectComment" />
-        <RegExpr attribute="Tags" context="#pop" String="[@\\]enddot\b" endRegion="Dot" />
+      <context name="SL_FormulaEnv" attribute="Word" lineEndContext="SL_FindNextLine">
+        <DetectChar attribute="Tags" context="#pop!SL_FormulaEnvStart" char="}" />
+      </context>
+
+      <context name="SL_FormulaEnvStart" attribute="Formulas" lineEndContext="SL_FindNextLine" fallthroughContext="#pop!SL_FormulaEnvFormula">
+        <DetectSpaces attribute="Comment" />
+        <DetectChar attribute="Tags" context="#pop!SL_FormulaEnvFormula" char="{" />
+      </context>
+
+      <context name="SL_FormulaEnvFormula" attribute="Formulas" lineEndContext="SL_FindNextLine">
+        <StringDetect attribute="Tags" context="#pop" String="\f}" endRegion="VerbatimBlock" />
+        <StringDetect attribute="Tags" context="#pop" String="@f}" endRegion="VerbatimBlock" />
+        <!-- TODO: How to force LaTeX math context here?? -->
+        <!-- <IncludeRules context="##LaTeX" /> -->
+      </context>
+
+      <context name="SL_Msc" attribute="Message Sequence Chart" lineEndContext="SL_FindNextLine">
+        <WordDetect attribute="Tags" context="#pop" String="\endmsc" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@endmsc" endRegion="VerbatimBlock" />
+      </context>
+
+      <context name="SL_Dot" attribute="Dot Graph" lineEndContext="SL_FindNextLine">
+        <WordDetect attribute="Tags" context="#pop" String="\enddot" endRegion="VerbatimBlock" />
+        <WordDetect attribute="Tags" context="#pop" String="@enddot" endRegion="VerbatimBlock" />
+      </context>
+
+      <context name="Entities" attribute="Word" lineEndContext="#stay">
+        <RegExpr attribute="Entities" context="#pop" String="&amp;[A-Za-z]+&#59;" />
+        <DetectChar attribute="Comment" context="#pop" char="&amp;" />
+      </context>
+
+      <context name="Inc_OtherTag" attribute="Comment" lineEndContext="#pop">
+        <keyword attribute="Note" context="#pop" String="Note" />
+        <keyword attribute="Warning" context="#pop" String="Warning" />
+        <keyword attribute="Attention" context="#pop" String="Attention" />
+        <keyword attribute="Todo" context="#pop" String="Todo" />
+        <keyword attribute="Tags" context="#pop" String="TagOnly" />
+        <Detect2Chars attribute="Region" context="#pop" char="@" char1="{" beginRegion="Group" />
+        <Detect2Chars attribute="Region" context="#pop" char="@" char1="}" endRegion="Group" />
+        <Detect2Chars attribute="Tags" context="#pop!LanguageId" char="\" char1="~" />
+        <Detect2Chars attribute="Tags" context="#pop!LanguageId" char="@" char1="~" />
+        <keyword attribute="Error" context="#pop" String="TagEnd" />
+        <RegExpr attribute="Error" context="#pop" String="[@\\]f[]}]" />
+        <RegExpr attribute="Tags" context="#pop" String="[@\\](?:[#$%&amp;&lt;&gt;&quot;@\\.]|::|---?)(?=&wordsep;)" />
+        <RegExpr attribute="Custom Tags" context="#pop" String="[@\\](?:[^@\\ \t\*]|\*(?!/))+" />
+        <DetectChar attribute="Comment" context="#pop" char="\" />
+        <DetectChar attribute="Comment" context="#pop" char="@" />
+      </context>
+
+      <context name="LanguageId" attribute="Word" lineEndContext="#pop" fallthroughContext="#pop">
+        <DetectIdentifier />
       </context>
 
   </contexts>
@@ -480,10 +621,11 @@
       <itemData name="Warning"      defStyleNum="dsWarning" bold="1" italic="0" />
       <itemData name="Attention"    defStyleNum="dsAnnotation" bold="1" italic="0" />
       <itemData name="Todo"         defStyleNum="dsAnnotation" bold="1" italic="0" />
+      <itemData name="Error"        defStyleNum="dsError" />
     </itemDatas>
   </highlighting>
   <general>
-    <keywords casesensitive="1" weakDeliminator="\$~" />
+    <keywords casesensitive="1" weakDeliminator="\$" />
   </general>
 </language>
 <!-- kate: indent-width 2; -->
diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/java.xml b/src/libs/3rdparty/syntax-highlighting/data/syntax/java.xml
index f59415048e7..938b25a0f35 100644
--- a/src/libs/3rdparty/syntax-highlighting/data/syntax/java.xml
+++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/java.xml
@@ -4,7 +4,7 @@
 	<!ENTITY int "[0-9]([0-9_]*[0-9])?">
 	<!ENTITY hex "[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?">
 ]>
-<language name="Java" version="5" kateversion="5.0" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<language name="Java" version="6" 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>
@@ -3786,9 +3786,9 @@
 				<RegExpr attribute="Keyword" context="Imports" String="\b(package|import)\b" />
 				<RegExpr attribute="Function" context="#stay" String="\b[_\w][_\w\d]*(?=[\s]*(/\*\s*\d+\s*\*/\s*)?[(])" />
 				<RegExpr attribute="Annotation" context="#stay" String="@[_\w][_\w\d]*" />
-				<RegExpr attribute="Symbol" context="Member" String="[.]{1,1}" />
+				<DetectChar attribute="Symbol" context="Member" char="." />
 				<DetectChar attribute="Symbol" context="InFunctionCall" char="("/>
-				<AnyChar attribute="Symbol" context="#stay" String=":!%&amp;+,-/.*&lt;=&gt;?[]|~^&#59;"/>
+				<AnyChar attribute="Symbol" context="#stay" String=":!%&amp;+,-/*&lt;=&gt;?[]|~^&#59;"/>
 			</context>
 			<context attribute="Normal Text" lineEndContext="#stay" name="InFunctionCall">
 				<IncludeRules context="Normal"/>
diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/markdown.xml b/src/libs/3rdparty/syntax-highlighting/data/syntax/markdown.xml
index b47b1afceed..d836d1c3f4c 100644
--- a/src/libs/3rdparty/syntax-highlighting/data/syntax/markdown.xml
+++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/markdown.xml
@@ -90,7 +90,7 @@
 <!ENTITY checkbox "\[[ x]\](?=\s)">
 ]>
 
-<language name="Markdown" version="11" kateversion="5.53" section="Markup" extensions="*.md;*.mmd;*.markdown" priority="15" author="Darrin Yeager, Claes Holmerson" license="GPL,BSD">
+<language name="Markdown" version="13" kateversion="5.53" section="Markup" extensions="*.md;*.mmd;*.markdown" priority="15" author="Darrin Yeager, Claes Holmerson" license="GPL,BSD">
   <highlighting>
     <contexts>
       <!-- Start of the Markdown document: find metadata or code block -->
@@ -320,11 +320,12 @@
         <RegExpr attribute="Fenced Code" context="#pop!matlab-code" String="&fcode;\s*matlab&end;" insensitive="true"/>
         <RegExpr attribute="Fenced Code" context="#pop!markdown-code" String="&fcode;\s*(?:markdown|m?md)&end;" insensitive="true"/>
         <RegExpr attribute="Fenced Code" context="#pop!mustache-code" String="&fcode;\s*(?:handlebars|hbs|mustache|mst|ractive|hogan|hulk)&end;" insensitive="true"/> <!-- Included in the HTML definition -->
-        <RegExpr attribute="Fenced Code" context="#pop!perl-code" String="&fcode;\s*(?:perl|p[lm]|pod|psgi|vcl|perl6|p[lm]?6|nqp)&end;" insensitive="true"/>
+        <RegExpr attribute="Fenced Code" context="#pop!perl-code" String="&fcode;\s*(?:perl|p[lm]|pod|psgi|vcl)&end;" insensitive="true"/>
         <RegExpr attribute="Fenced Code" context="#pop!php-code" String="&fcode;\s*(?:php[3457t]?|wml|phtml?|aw|ctp)&end;" insensitive="true"/>
         <RegExpr attribute="Fenced Code" context="#pop!python-code" String="&fcode;\s*(?:python[23]?|py[23w]?|[rc]py|sconstruct|gypi?)&end;" insensitive="true"/>
         <RegExpr attribute="Fenced Code" context="#pop!qml-code" String="&fcode;\s*qml(?:types)?&end;" insensitive="true"/>
         <RegExpr attribute="Fenced Code" context="#pop!r-code" String="&fcode;\s*(?:r|rprofile|rscript)&end;" insensitive="true"/>
+        <RegExpr attribute="Fenced Code" context="#pop!raku-code" String="&fcode;\s*(?:raku(?:mod|doc|test)?|perl6|p[lm]?6|pod6|nqp)&end;" insensitive="true"/>
         <RegExpr attribute="Fenced Code" context="#pop!rest-code" String="&fcode;\s*(?:rst|rest|restructuredtext)&end;" insensitive="true"/> <!-- Included in the CMake definition -->
         <RegExpr attribute="Fenced Code" context="#pop!ruby-code" String="&fcode;\s*(?:ruby|rbx?|rjs|rake|f?cgi|gemspec|irbrc|ru|prawn|Appraisals|(?:Rake|Cap|Chef|Gem|Guard|Hobo|Vagrant||Rant|Berks|Thor|Puppet)file|rxml|(?:xml|js)\.erb)&end;" insensitive="true"/>
         <RegExpr attribute="Fenced Code" context="#pop!rust-code" String="&fcode;\s*(?:rust|rs)&end;" insensitive="true"/>
@@ -432,6 +433,10 @@
         <IncludeRules context="code"/>
         <IncludeRules context="##R Script" includeAttrib="true"/>
       </context>
+      <context attribute="Normal Text" lineEndContext="#stay" name="raku-code">
+        <IncludeRules context="code"/>
+        <IncludeRules context="base##Raku" includeAttrib="true"/>
+      </context>
       <context attribute="Normal Text" lineEndContext="#stay" name="rest-code">
         <IncludeRules context="code"/>
         <IncludeRules context="##reStructuredText" includeAttrib="true"/>
diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/perl.xml b/src/libs/3rdparty/syntax-highlighting/data/syntax/perl.xml
index 26c82cd66ef..964e31b67ae 100644
--- a/src/libs/3rdparty/syntax-highlighting/data/syntax/perl.xml
+++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/perl.xml
@@ -39,7 +39,7 @@
 
    Enhance tr/// and y/// support.
 -->
-<language name="Perl" version="10" 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="11" 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>
@@ -674,7 +674,7 @@
       <context name="regex_pattern_internal_rules_2" attribute="Pattern" lineEndContext="#stay">
         <Detect2Chars attribute="Pattern Internal Operator" context="pat_ext" char="(" char1="?" />
         <DetectChar attribute="Pattern Internal Operator" context="pat_char_class" char="[" />
-        <RegExpr attribute="Pattern Internal Operator" context="#stay" String="[()?^*+|]" />
+        <AnyChar attribute="Pattern Internal Operator" context="#stay" String="()?^*+|" />
         <RegExpr attribute="Pattern Internal Operator" context="#stay" String="\{[\d, ]+\}" />
         <DetectChar attribute="Pattern Internal Operator" context="#stay" char="$" />
         <RegExpr attribute="Comment" context="#stay" String="\s{3,}#.*$" />
@@ -694,8 +694,8 @@
         <IncludeRules context="regex_pattern_internal_rules_2" />
       </context>
       <context name="pat_ext" attribute="Pattern Internal Operator" lineEndContext="#stay">
+        <AnyChar attribute="Pattern Internal Operator" context="#pop" String=":=!&gt;&lt;" />
         <RegExpr attribute="Comment" context="#pop" String="\#[^)]*" />
-        <RegExpr attribute="Pattern Internal Operator" context="#pop" String="[:=!&gt;&lt;]+" />
         <DetectChar attribute="Pattern Internal Operator" context="#pop" char=")" />
       </context>
       <context name="pat_char_class" attribute="Pattern Character Class" lineEndContext="#stay">
diff --git a/src/libs/3rdparty/syntax-highlighting/data/syntax/powershell.xml b/src/libs/3rdparty/syntax-highlighting/data/syntax/powershell.xml
index e5c1e44c45a..03acb0f5a91 100644
--- a/src/libs/3rdparty/syntax-highlighting/data/syntax/powershell.xml
+++ b/src/libs/3rdparty/syntax-highlighting/data/syntax/powershell.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE language SYSTEM "language.dtd">
 <language
   name="PowerShell"
-  version="5"
+  version="6"
   kateversion="5.0"
   extensions="*.ps1;*.ps1m;*.ps1d"
   section="Scripts"
@@ -889,8 +889,8 @@
         <RegExpr attribute="Keyword" context="#stay" String="\b\$script(?=\s+(:))"/>
         <RegExpr attribute="Variable" context="#stay" String="\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*" />
         <keyword attribute="Special Variable" context="#stay" String="special-variables"/>
-        <RegExpr attribute="Symbol" context="Member" String="[.]{1,1}" />
-        <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/.*&lt;=&gt;?[]|~^&#59;"/>
+        <DetectChar attribute="Symbol" context="Member" char="." />
+        <AnyChar attribute="Symbol" context="#stay" String=":!%&amp;()+,-/*&lt;=&gt;?[]|~^&#59;"/>
       </context>
       <context attribute="String Char" lineEndContext="#stay" name="StringEscape">
         <RegExpr attribute="String Char" String="`[`&quot;0abefnrtv]" context="#stay"/>
diff --git a/src/libs/3rdparty/syntax-highlighting/src/CMakeLists.txt b/src/libs/3rdparty/syntax-highlighting/src/CMakeLists.txt
index b8820252c58..beac3d50e89 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/CMakeLists.txt
+++ b/src/libs/3rdparty/syntax-highlighting/src/CMakeLists.txt
@@ -3,3 +3,9 @@ if(TARGET Qt5::Gui)
     add_subdirectory(lib)
     add_subdirectory(cli)
 endif()
+
+ecm_qt_install_logging_categories(
+    EXPORT KSYNTAXHIGHLIGHTING
+    FILE ksyntaxhighlighting.categories
+    DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+)
diff --git a/src/libs/3rdparty/syntax-highlighting/src/indexer/katehighlightingindexer.cpp b/src/libs/3rdparty/syntax-highlighting/src/indexer/katehighlightingindexer.cpp
index 82235819a1c..aeb4c2db557 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/indexer/katehighlightingindexer.cpp
+++ b/src/libs/3rdparty/syntax-highlighting/src/indexer/katehighlightingindexer.cpp
@@ -25,7 +25,7 @@
 #include <QDebug>
 #include <QFile>
 #include <QFileInfo>
-#include <QJsonDocument>
+#include <QCborValue>
 #include <QRegularExpression>
 #include <QVariant>
 #include <QXmlStreamReader>
@@ -774,7 +774,7 @@ int main(int argc, char *argv[])
         return 9;
 
     // write out json
-    outFile.write(QJsonDocument::fromVariant(QVariant(hls)).toBinaryData());
+    outFile.write(QCborValue::fromVariant(QVariant(hls)).toCbor());
 
     // be done
     return 0;
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/CMakeLists.txt b/src/libs/3rdparty/syntax-highlighting/src/lib/CMakeLists.txt
index 02c889d7a26..d208d48f5c4 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/lib/CMakeLists.txt
+++ b/src/libs/3rdparty/syntax-highlighting/src/lib/CMakeLists.txt
@@ -22,7 +22,8 @@ set(syntax_highlighting_srcs
 ecm_qt_declare_logging_category(syntax_highlighting_srcs
     HEADER ksyntaxhighlighting_logging.h
     IDENTIFIER KSyntaxHighlighting::Log
-    CATEGORY_NAME org.kde.ksyntaxhighlighting
+    CATEGORY_NAME kf.syntaxhighlighting
+    OLD_CATEGORY_NAMES org.kde.ksyntaxhighlighting
     DESCRIPTION "Syntax Highlighting"
     EXPORT KSYNTAXHIGHLIGHTING
 )
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/definition.cpp b/src/libs/3rdparty/syntax-highlighting/src/lib/definition.cpp
index bc43473bf28..1bb5e3d2702 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/lib/definition.cpp
+++ b/src/libs/3rdparty/syntax-highlighting/src/lib/definition.cpp
@@ -37,10 +37,10 @@
 #include "rule_p.h"
 #include "xml_p.h"
 
+#include <QCborMap>
 #include <QCoreApplication>
 #include <QFile>
 #include <QHash>
-#include <QJsonObject>
 #include <QStringList>
 #include <QVector>
 #include <QXmlStreamReader>
@@ -456,12 +456,12 @@ bool DefinitionData::loadMetaData(const QString &definitionFileName)
     return false;
 }
 
-bool DefinitionData::loadMetaData(const QString &file, const QJsonObject &obj)
+bool DefinitionData::loadMetaData(const QString &file, const QCborMap &obj)
 {
     name = obj.value(QLatin1String("name")).toString();
     section = obj.value(QLatin1String("section")).toString();
-    version = obj.value(QLatin1String("version")).toInt();
-    priority = obj.value(QLatin1String("priority")).toInt();
+    version = obj.value(QLatin1String("version")).toInteger();
+    priority = obj.value(QLatin1String("priority")).toInteger();
     style = obj.value(QLatin1String("style")).toString();
     author = obj.value(QLatin1String("author")).toString();
     license = obj.value(QLatin1String("license")).toString();
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/definition_p.h b/src/libs/3rdparty/syntax-highlighting/src/lib/definition_p.h
index f9b779482e2..c654d632c9d 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/lib/definition_p.h
+++ b/src/libs/3rdparty/syntax-highlighting/src/lib/definition_p.h
@@ -32,8 +32,8 @@
 #include <QVector>
 
 QT_BEGIN_NAMESPACE
+class QCborMap;
 class QXmlStreamReader;
-class QJsonObject;
 QT_END_NAMESPACE
 
 namespace KSyntaxHighlighting
@@ -53,7 +53,7 @@ public:
 
     bool isLoaded() const;
     bool loadMetaData(const QString &definitionFileName);
-    bool loadMetaData(const QString &fileName, const QJsonObject &obj);
+    bool loadMetaData(const QString &fileName, const QCborMap &obj);
 
     void clear();
 
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/repository.cpp b/src/libs/3rdparty/syntax-highlighting/src/lib/repository.cpp
index f61365869e9..c45dfa7d3cf 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/lib/repository.cpp
+++ b/src/libs/3rdparty/syntax-highlighting/src/lib/repository.cpp
@@ -30,11 +30,11 @@
 #include "themedata_p.h"
 #include "wildcardmatcher_p.h"
 
+#include <QCborMap>
+#include <QCborValue>
 #include <QDirIterator>
 #include <QFile>
 #include <QFileInfo>
-#include <QJsonDocument>
-#include <QJsonObject>
 
 #ifndef NO_STANDARD_PATHS
 #include <QStandardPaths>
@@ -224,13 +224,13 @@ bool RepositoryPrivate::loadSyntaxFolderFromIndex(Repository *repo, const QStrin
     if (!indexFile.open(QFile::ReadOnly))
         return false;
 
-    const auto indexDoc(QJsonDocument::fromBinaryData(indexFile.readAll()));
-    const auto index = indexDoc.object();
+    const auto indexDoc(QCborValue::fromCbor(indexFile.readAll()));
+    const auto index = indexDoc.toMap();
     for (auto it = index.begin(); it != index.end(); ++it) {
-        if (!it.value().isObject())
+        if (!it.value().isMap())
             continue;
-        const auto fileName = QString(path + QLatin1Char('/') + it.key());
-        const auto defMap = it.value().toObject();
+        const auto fileName = QString(path + QLatin1Char('/') + it.key().toString());
+        const auto defMap = it.value().toMap();
         Definition def;
         auto defData = DefinitionData::get(def);
         defData->repo = repo;